mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#105433# get file name for header/footer with DECODE_UNAMBIGUOUS

Browse Source
This commit is contained in:
Niklas Nebel
2002-11-21 18:10:49 +00:00
parent a4c21c9094
commit a652ec9f90
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sc/source/ui/view/prevwsh.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: prevwsh.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: ssa $ $Date: 2002-09-17 09:50:48 $
* last change: $Author: nn $ $Date: 2002-11-21 19:10:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -747,9 +747,10 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData )
pDoc->GetName( nTab, rData.aTabName );
rData.aTitle = pDocShell->GetTitle();
rData.aLongDocName = pDocShell->GetMedium()->GetName();
const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
if ( rData.aLongDocName.Len() )
rData.aShortDocName = INetURLObject( rData.aLongDocName ).GetName();
rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS );
else
rData.aShortDocName = rData.aLongDocName = rData.aTitle;
rData.nPageNo = pPreview->GetPageNo() + 1;

9
sc/source/ui/view/printfun.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: printfun.cxx,v $
*
* $Revision: 1.24 $
* $Revision: 1.25 $
*
* last change: $Author: nn $ $Date: 2002-11-06 14:52:49 $
* last change: $Author: nn $ $Date: 2002-11-21 19:10:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1037,9 +1037,10 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
SetDateTime( Date(), Time() );
aFieldData.aTitle = pDocShell->GetTitle();
aFieldData.aLongDocName = pDocShell->GetMedium()->GetName();
const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
if ( aFieldData.aLongDocName.Len() )
aFieldData.aShortDocName = INetURLObject( aFieldData.aLongDocName ).GetName();
aFieldData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS );
else
aFieldData.aShortDocName = aFieldData.aLongDocName = aFieldData.aTitle;

9
sc/source/ui/view/tabvwsh4.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: tabvwsh4.cxx,v $
*
* $Revision: 1.26 $
* $Revision: 1.27 $
*
* last change: $Author: sab $ $Date: 2002-10-18 13:16:37 $
* last change: $Author: nn $ $Date: 2002-11-21 19:10:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1789,9 +1789,10 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData )
pDoc->GetName( nTab, rData.aTabName );
rData.aTitle = pDocShell->GetTitle();
rData.aLongDocName = pDocShell->GetMedium()->GetName();
const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
if ( rData.aLongDocName.Len() )
rData.aShortDocName = INetURLObject( rData.aLongDocName ).GetName();
rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS );
else
rData.aShortDocName = rData.aLongDocName = rData.aTitle;
rData.nPageNo = 1;