diff options
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/view/printfun.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 8 |
3 files changed, 19 insertions, 3 deletions
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index ccb10ee21ec6..85dd30641050 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -77,6 +77,7 @@ #include <basegfx/tools/zoomtools.hxx> #include <svx/zoom_def.hxx> +#include <com/sun/star/document/XDocumentProperties.hpp> #include "sc.hrc" #include "scabstdlg.hxx" @@ -844,7 +845,11 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData ) pDoc->GetName(nTab, aTmp); rData.aTabName = aTmp; - rData.aTitle = pDocShell->GetTitle(); + if( pDocShell->getDocProperties()->getTitle().getLength() != 0 ) + rData.aTitle = pDocShell->getDocProperties()->getTitle(); + else + rData.aTitle = pDocShell->GetTitle(); + const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); if ( rData.aLongDocName.Len() ) diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 01f1b5bedd25..9d82ba5d1504 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -83,6 +83,7 @@ #include <vcl/lineinfo.hxx> #include <boost/scoped_ptr.hpp> +#include <com/sun/star/document/XDocumentProperties.hpp> #define ZOOM_MIN 10 @@ -1037,7 +1038,11 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) SetDateTime( Date( Date::SYSTEM ), Time( Time::SYSTEM ) ); - aFieldData.aTitle = pDocShell->GetTitle(); + if( pDocShell->getDocProperties()->getTitle().getLength() != 0 ) + aFieldData.aTitle = pDocShell->getDocProperties()->getTitle(); + else + aFieldData.aTitle = pDocShell->GetTitle(); + const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); if ( aFieldData.aLongDocName.Len() ) diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index cf93d15309bb..35c2c5403fc8 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -97,6 +97,8 @@ #include "markdata.hxx" #include "preview.hxx" +#include <com/sun/star/document/XDocumentProperties.hpp> + void ActivateOlk( ScViewData* pViewData ); void DeActivateOlk( ScViewData* pViewData ); @@ -1824,7 +1826,11 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) pDoc->GetName(nTab, aTmp); rData.aTabName = aTmp; - rData.aTitle = pDocShell->GetTitle(); + if( pDocShell->getDocProperties()->getTitle().getLength() != 0 ) + rData.aTitle = pDocShell->getDocProperties()->getTitle(); + else + rData.aTitle = pDocShell->GetTitle(); + const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); if ( rData.aLongDocName.Len() ) |