summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/ui/inc/prevwsh.hxx3
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx1
-rw-r--r--sc/source/ui/view/prevwsh.cxx5
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx5
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx5
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx12
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx3
-rw-r--r--sfx2/source/view/viewprn.cxx7
-rw-r--r--starmath/inc/view.hxx1
-rw-r--r--starmath/source/view.cxx4
-rw-r--r--sw/source/ui/inc/pview.hxx3
-rw-r--r--sw/source/ui/inc/view.hxx5
-rw-r--r--sw/source/ui/uiview/pview.cxx5
-rw-r--r--sw/source/ui/uiview/viewprt.cxx5
14 files changed, 41 insertions, 23 deletions
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 60d0872a0662..753047843fc4 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -110,7 +110,8 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual SfxPrinter* GetPrinter( sal_Bool bCreate = false );
- virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+ virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+ virtual bool HasPrintOptionsPage() const;
virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
void AddAccessibilityObject( SfxListener& rObject );
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 54606fad3c71..d1e53adb39e4 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -353,6 +353,7 @@ public:
virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter,
sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false );
+ virtual bool HasPrintOptionsPage() const;
virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
void ConnectObject( SdrOle2Obj* pObj );
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 505544e7fba6..37e0e8678d95 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -570,6 +570,11 @@ sal_uInt16 ScPreviewShell::SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiff
return pDocShell->SetPrinter( pNewPrinter, nDiffFlags );
}
+bool ScPreviewShell::HasPrintOptionsPage() const
+{
+ return true;
+}
+
SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions )
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 799f95322a1c..d154b0148b53 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1093,6 +1093,11 @@ sal_uInt16 ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiff
return GetViewData()->GetDocShell()->SetPrinter( pNewPrinter, nDiffFlags );
}
+bool ScTabViewShell::HasPrintOptionsPage() const
+{
+ return true;
+}
+
SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions )
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 9377c83093e8..458896a042f8 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -139,11 +139,6 @@ public:
SfxPrinter* pNewPrinter,
sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false);
- /// Forwarded to the print manager.
- virtual SfxTabPage* CreatePrintOptionsPage (
- ::Window *pParent,
- const SfxItemSet &rOptions);
-
/// Forward methods to main sub shell.
virtual void WriteUserDataSequence (
::com::sun::star::uno::Sequence <
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index d7322801290b..0cd5c67b7902 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -626,18 +626,6 @@ sal_uInt16 ViewShellBase::SetPrinter (
-SfxTabPage* ViewShellBase::CreatePrintOptionsPage(
- ::Window *pParent,
- const SfxItemSet &rOptions)
-{
- (void)pParent;
- (void)rOptions;
- return NULL;
-}
-
-
-
-
void ViewShellBase::UIActivating( SfxInPlaceClient* pClient )
{
mpImpl->ShowViewTabBar(false);
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index da8bd20776df..b7110a67c700 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -214,7 +214,8 @@ public:
// Printing Interface
virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False );
- virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=sal_False );
+ virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=sal_False );
+ virtual bool HasPrintOptionsPage() const;
virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
virtual JobSetup GetJobSetup() const;
Printer* GetActivePrinter() const;
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 2139008560f7..7b978d372f18 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -829,7 +829,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
// execute PrinterSetupDialog
PrinterSetupDialog* pPrintSetupDlg = new PrinterSetupDialog( GetWindow() );
- if (pImp->m_bHasPrintOptions)
+ if (pImp->m_bHasPrintOptions && HasPrintOptionsPage())
{
// additional controls for dialog
pExecutor = new SfxDialogExecutor_Impl( this, pPrintSetupDlg );
@@ -919,6 +919,11 @@ SfxTabPage* SfxViewShell::CreatePrintOptionsPage
return 0;
}
+bool SfxViewShell::HasPrintOptionsPage() const
+{
+ return false;
+}
+
JobSetup SfxViewShell::GetJobSetup() const
{
return JobSetup();
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index f508cf5a87a1..cdfb6143569b 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -266,6 +266,7 @@ protected:
bool Insert( SfxMedium& rMedium );
bool InsertFrom(SfxMedium &rMedium);
+ virtual bool HasPrintOptionsPage() const;
virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent,
const SfxItemSet &rOptions);
virtual void Deactivate(sal_Bool IsMDIActivate);
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 2c12b3c4cdef..f2713f576ca0 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1381,6 +1381,10 @@ sal_uInt16 SmViewShell::SetPrinter(SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlag
return 0;
}
+bool SmViewShell::HasPrintOptionsPage() const
+{
+ return true;
+}
SfxTabPage* SmViewShell::CreatePrintOptionsPage(Window *pParent,
const SfxItemSet &rOptions)
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx
index 25d9050f5e09..68446c477f2d 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/ui/inc/pview.hxx
@@ -211,7 +211,8 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False );
- SW_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+ SW_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+ SW_DLLPRIVATE virtual bool HasPrintOptionsPage() const;
SW_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent,
const SfxItemSet &rOptions );
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index ff93acfefadd..473f9c6e1440 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -329,13 +329,14 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SW_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = 0 );
SW_DLLPRIVATE void HyphStart( SvxSpellArea eSpell );
- SW_DLLPRIVATE sal_Bool CheckSpecialCntnt();
+ SW_DLLPRIVATE sal_Bool CheckSpecialCntnt();
SW_DLLPRIVATE void SpellKontext(sal_Bool bOn = sal_True)
{ bCenterCrsr = bOn; bAllwaysShowSel = bOn; }
// methods for printing
SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False );
- SfxTabPage* CreatePrintOptionsPage( Window* pParent,
+ SW_DLLPRIVATE virtual bool HasPrintOptionsPage() const;
+ SW_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window* pParent,
const SfxItemSet& rSet);
// for readonly switching
SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index e064a0083a09..6d0bb7095eb5 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1759,6 +1759,11 @@ sal_uInt16 SwPagePreView::SetPrinter( SfxPrinter *pNew, sal_uInt16 nDiffFlags,
return 0;
}
+bool SwPagePreView::HasPrintOptionsPage() const
+{
+ return true;
+}
+
SfxTabPage* SwPagePreView::CreatePrintOptionsPage( Window *pParent,
const SfxItemSet &rOptions )
{
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index a98df93cac81..691431936ea3 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -141,6 +141,11 @@ sal_uInt16 SwView::SetPrinter(SfxPrinter* pNew, sal_uInt16 nDiffFlags, bool )
return 0;
}
+bool SwView::HasPrintOptionsPage() const
+{
+ return true;
+}
+
/*--------------------------------------------------------------------
Beschreibung: TabPage fuer applikationsspezifische Druckoptionen
--------------------------------------------------------------------*/
generated by cgit (git 2.34.1) at 2025-02-03 19:49:05 +0000