summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/UI_swriter.mk2
-rw-r--r--sw/inc/chrdlg.hrc4
-rw-r--r--sw/inc/globals.hrc2
-rw-r--r--sw/source/ui/app/app.src4
-rw-r--r--sw/source/ui/chrdlg/chrdlg.src4
-rw-r--r--sw/source/ui/config/optdlg.hrc2
-rw-r--r--sw/source/ui/config/optdlg.src4
-rw-r--r--sw/source/ui/config/optpage.cxx264
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx3
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hrc1
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.src4
-rw-r--r--sw/source/ui/inc/optpage.hxx55
-rw-r--r--sw/source/ui/misc/outline.cxx2
-rw-r--r--sw/source/ui/misc/pgfnote.cxx2
-rw-r--r--sw/uiconfig/swriter/ui/printoptions.ui555
-rw-r--r--sw/uiconfig/swriter/ui/printoptionspage.ui509
16 files changed, 663 insertions, 754 deletions
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index 3e0158fc3f5a..fc4a2596086e 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/linenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
sw/uiconfig/swriter/ui/outlinepositionpage \
- sw/uiconfig/swriter/ui/printoptions \
+ sw/uiconfig/swriter/ui/printoptionspage \
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/sortdialog \
sw/uiconfig/swriter/ui/splittable \
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index ea17a38e58cf..5bbe3d62cab8 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -29,11 +29,9 @@
// Tabpages -> now in globals.hrc
+#define MSG_ILLEGAL_PAGENUM (RC_CHRDLG_BEGIN + 1)
#define STR_TEXTCOLL_HEADER (RC_CHRDLG_BEGIN + 2)
#define STR_PAGEFMT_HEADER (RC_CHRDLG_BEGIN + 4)
-#define SW_STR_NONE (RC_CHRDLG_BEGIN + 5)
-
-#define MSG_ILLEGAL_PAGENUM (RC_CHRDLG_BEGIN + 1)
#define CHRDLG_ACT_END DLG_DRAWPARA
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index cf206a546744..73c73aeb85c9 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -67,7 +67,7 @@
#define STR_REMOVE_WARNING (RC_GLOBALS_BEGIN + 40)
-#define STR_NO_COLL (RC_GLOBALS_BEGIN + 41)
+#define SW_STR_NONE (RC_GLOBALS_BEGIN + 41)
// DIALOGS -----------------------------------------------------------
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 45064b1239d2..dbfd44b26be6 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -235,9 +235,9 @@ String STR_REMOVE_WARNING
Text [ en-US ] = "The following characters are not valid and have been removed: ";
};
-String STR_NO_COLL
+String SW_STR_NONE
{
- Text [ en-US ] = "(none)" ;
+ Text [ en-US ] = "[None]" ;
};
InfoBox MSG_ERROR_SEND_MAIL
diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src
index c4a6a5939919..43359ae5b9e6 100644
--- a/sw/source/ui/chrdlg/chrdlg.src
+++ b/sw/source/ui/chrdlg/chrdlg.src
@@ -25,10 +25,6 @@ String STR_PAGEFMT_HEADER
{
Text [ en-US ] = "(Page Style: " ;
};
-String SW_STR_NONE
-{
- Text [ en-US ] = "[None]" ;
-};
InfoBox MSG_ILLEGAL_PAGENUM
{
BUTTONS = WB_OK ;
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index b02e34d0e4ef..8ec5e4293500 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -80,7 +80,7 @@
#define RB_ONLY 81
#define RB_END 82
#define RB_PAGEEND 83
-#define ST_NONE 84
+
#define LB_FAX 86
#define CB_BLACK_FONT 87
#define LB_HMETRIC 88
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 4454feef81cd..b15c1c5c5735 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -369,10 +369,6 @@ TabPage TP_OPTPRINT_PAGE
DropDown = TRUE ;
Group = TRUE ;
};
- String ST_NONE
- {
- Text [ en-US ] = "<None>";
- };
};
TabPage TP_STD_FONT
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 10a6f295c410..f23586ee56b7 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -191,7 +191,7 @@ void SwContentOptPage::Reset(const SfxItemSet& rSet)
if(pElemAttr)
{
aTblCB .Check (pElemAttr->bTable );
- aGrfCB .Check (pElemAttr->bGraphic );
+ aGrfCB.Check (pElemAttr->bGraphic );
aDrwCB .Check (pElemAttr->bDrawing );
aFldNameCB .Check (pElemAttr->bFieldName );
aPostItCB .Check (pElemAttr->bNotes );
@@ -220,7 +220,7 @@ sal_Bool SwContentOptPage::FillItemSet(SfxItemSet& rSet)
if(pOldAttr)
aElem = *pOldAttr;
aElem.bTable = aTblCB .IsChecked();
- aElem.bGraphic = aGrfCB .IsChecked();
+ aElem.bGraphic = aGrfCB.IsChecked();
aElem.bDrawing = aDrwCB .IsChecked();
aElem.bFieldName = aFldNameCB .IsChecked();
aElem.bNotes = aPostItCB .IsChecked();
@@ -285,105 +285,83 @@ IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox)
/*------------------------------------------------------
TabPage Printer additional settings
-------------------------------------------------------*/
-SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
- const SfxItemSet& rCoreSet) :
- SfxTabPage( pParent, SW_RES( TP_OPTPRINT_PAGE ), rCoreSet),
- aFL1 (this, SW_RES(FL_1)),
- aGrfCB (this, SW_RES(CB_PGRF)),
- aCtrlFldCB (this, SW_RES(CB_CTRLFLD)),
- aBackgroundCB (this, SW_RES(CB_BACKGROUND)),
- aBlackFontCB (this, SW_RES(CB_BLACK_FONT)),
- aPrintHiddenTextCB(this, SW_RES(CB_HIDDEN_TEXT)),
- aPrintTextPlaceholderCB(this, SW_RES(CB_TEXT_PLACEHOLDER)),
- aSeparatorLFL (this, SW_RES(FL_SEP_PRT_LEFT )),
- aFL2 (this, SW_RES(FL_2)),
- aLeftPageCB (this, SW_RES(CB_LEFTP)),
- aRightPageCB (this, SW_RES(CB_RIGHTP)),
- aProspectCB (this, SW_RES(CB_PROSPECT)),
- aProspectCB_RTL (this, SW_RES(CB_PROSPECT_RTL)),
- aSeparatorRFL (this, SW_RES(FL_SEP_PRT_RIGHT)),
- aFL3 (this, SW_RES(FL_3)),
- aNoRB (this, SW_RES(RB_NO)),
- aOnlyRB (this, SW_RES(RB_ONLY)),
- aEndRB (this, SW_RES(RB_END)),
- aEndPageRB (this, SW_RES(RB_PAGEEND)),
- aFL4 (this, SW_RES(FL_4)),
- aPrintEmptyPagesCB(this, SW_RES(CB_PRINTEMPTYPAGES)),
- aPaperFromSetupCB(this, SW_RES(CB_PAPERFROMSETUP)),
- aFaxFT (this, SW_RES(FT_FAX)),
- aFaxLB (this, SW_RES(LB_FAX)),
- sNone(SW_RES(ST_NONE)),
- bAttrModified( sal_False ),
- bPreview ( sal_False )
-{
+SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent,
+ const SfxItemSet& rCoreSet)
+ : SfxTabPage(pParent, "PrintOptionsPage",
+ "modules/swriter/ui/printoptionspage.ui", rCoreSet)
+ , sNone(SW_RESSTR(SW_STR_NONE))
+ , bAttrModified(sal_False)
+ , bPreview(sal_False)
+{
+ get(m_pGrfCB, "graphics");
+ get(m_pCtrlFldCB, "formcontrols");
+ get(m_pBackgroundCB, "background");
+ get(m_pBlackFontCB, "inblack");
+ get(m_pPrintHiddenTextCB, "hiddentext");
+ get(m_pPrintTextPlaceholderCB, "textplaceholder");
+
+ get(m_pPagesFrame, "pagesframe");
+ get(m_pLeftPageCB, "leftpages");
+ get(m_pRightPageCB, "rightpages");
+ get(m_pProspectCB, "brochure");
+ get(m_pProspectCB_RTL, "rtl");
+
+ get(m_pCommentsFrame, "commentsframe");
+ get(m_pNoRB, "none");
+ get(m_pOnlyRB, "only");
+ get(m_pEndRB, "end");
+ get(m_pEndPageRB, "endpage");
+ get(m_pPrintEmptyPagesCB, "blankpages");
+ get(m_pPaperFromSetupCB, "papertray");
+ get(m_pFaxLB, "fax");
+
Init();
- FreeResource();
+
Link aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
- aGrfCB.SetClickHdl( aLk );
- aRightPageCB.SetClickHdl( aLk );
- aLeftPageCB.SetClickHdl( aLk );
- aCtrlFldCB.SetClickHdl( aLk );
- aBackgroundCB.SetClickHdl( aLk );
- aBlackFontCB.SetClickHdl( aLk );
- aPrintHiddenTextCB.SetClickHdl( aLk );
- aPrintTextPlaceholderCB.SetClickHdl( aLk );
- aProspectCB.SetClickHdl( aLk );
- aProspectCB_RTL.SetClickHdl( aLk );
- aPaperFromSetupCB.SetClickHdl( aLk );
- aPrintEmptyPagesCB.SetClickHdl( aLk );
- aEndPageRB.SetClickHdl( aLk );
- aEndRB.SetClickHdl( aLk );
- aOnlyRB.SetClickHdl( aLk );
- aNoRB.SetClickHdl( aLk );
- aFaxLB.SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) );
+ m_pGrfCB->SetClickHdl( aLk );
+ m_pRightPageCB->SetClickHdl( aLk );
+ m_pLeftPageCB->SetClickHdl( aLk );
+ m_pCtrlFldCB->SetClickHdl( aLk );
+ m_pBackgroundCB->SetClickHdl( aLk );
+ m_pBlackFontCB->SetClickHdl( aLk );
+ m_pPrintHiddenTextCB->SetClickHdl( aLk );
+ m_pPrintTextPlaceholderCB->SetClickHdl( aLk );
+ m_pProspectCB->SetClickHdl( aLk );
+ m_pProspectCB_RTL->SetClickHdl( aLk );
+ m_pPaperFromSetupCB->SetClickHdl( aLk );
+ m_pPrintEmptyPagesCB->SetClickHdl( aLk );
+ m_pEndPageRB->SetClickHdl( aLk );
+ m_pEndRB->SetClickHdl( aLk );
+ m_pOnlyRB->SetClickHdl( aLk );
+ m_pNoRB->SetClickHdl( aLk );
+ m_pFaxLB->SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) );
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, sal_False, &pItem )
&& ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)
{
- aLeftPageCB .Hide();
- aRightPageCB .Hide();
- aPrintHiddenTextCB.Hide();
- aPrintTextPlaceholderCB.Hide();
- aProspectCB.SetPosPixel(aLeftPageCB.GetPosPixel());
- Point aPt( aRightPageCB.GetPosPixel() );
+ m_pLeftPageCB->Hide();
+ m_pRightPageCB->Hide();
+ m_pPrintHiddenTextCB->Hide();
+ m_pPrintTextPlaceholderCB->Hide();
+ m_pProspectCB->SetPosPixel(m_pLeftPageCB->GetPosPixel());
+ Point aPt( m_pRightPageCB->GetPosPixel() );
aPt.setX(aPt.getX() + 15); // indent
- aProspectCB_RTL.SetPosPixel(aPt);
-
- // hide aPrintEmptyPagesCB and move everything below up accordingly
- long nDeltaY = aPaperFromSetupCB.GetPosPixel().getY() - aPrintEmptyPagesCB.GetPosPixel().getY();
- aPrintEmptyPagesCB.Hide();
- aPt = aPaperFromSetupCB.GetPosPixel();
- aPt.setY( aPt.getY() - nDeltaY );
- aPaperFromSetupCB.SetPosPixel( aPt );
- aPt = aFaxFT.GetPosPixel();
- aPt.setY( aPt.getY() - nDeltaY );
- aFaxFT.SetPosPixel( aPt );
- aPt = aFaxLB.GetPosPixel();
- aPt.setY( aPt.getY() - nDeltaY );
- aFaxLB.SetPosPixel( aPt );
- }
- aProspectCB_RTL.Disable();
+ m_pProspectCB_RTL->SetPosPixel(aPt);
+
+ // hide m_pPrintEmptyPagesCB
+ m_pPrintEmptyPagesCB->Hide();
+ }
+ m_pProspectCB_RTL->Disable();
SvtCTLOptions aCTLOptions;
- aProspectCB_RTL.Show(aCTLOptions.IsCTLFontEnabled());
+ m_pProspectCB_RTL->Show(aCTLOptions.IsCTLFontEnabled());
}
void SwAddPrinterTabPage::SetPreview(sal_Bool bPrev)
{
bPreview = bPrev;
-
- if (bPreview)
- {
- aLeftPageCB.Disable();
- aRightPageCB.Disable();
- aProspectCB.Disable();
- aProspectCB_RTL.Disable();
- aFL3.Disable();
- aNoRB.Disable();
- aOnlyRB.Disable();
- aEndRB.Disable();
- aEndPageRB.Disable();
- }
+ m_pCommentsFrame->Enable(!bPreview);
+ m_pPagesFrame->Enable(!bPreview);
}
SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent,
@@ -397,34 +375,34 @@ sal_Bool SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
if ( bAttrModified )
{
SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER);
- aAddPrinterAttr.bPrintGraphic = aGrfCB.IsChecked();
+ aAddPrinterAttr.bPrintGraphic = m_pGrfCB->IsChecked();
aAddPrinterAttr.bPrintTable = sal_True; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
- aAddPrinterAttr.bPrintDraw = aGrfCB.IsChecked(); // UI merged with aGrfCB in CWS printerpullgpages /*aDrawCB.IsChecked()*/;
- aAddPrinterAttr.bPrintControl = aCtrlFldCB.IsChecked();
- aAddPrinterAttr.bPrintPageBackground = aBackgroundCB.IsChecked();
- aAddPrinterAttr.bPrintBlackFont = aBlackFontCB.IsChecked();
- aAddPrinterAttr.bPrintHiddenText = aPrintHiddenTextCB.IsChecked();
- aAddPrinterAttr.bPrintTextPlaceholder = aPrintTextPlaceholderCB.IsChecked();
-
- aAddPrinterAttr.bPrintLeftPages = aLeftPageCB.IsChecked();
- aAddPrinterAttr.bPrintRightPages = aRightPageCB.IsChecked();
+ aAddPrinterAttr.bPrintDraw = m_pGrfCB->IsChecked(); // UI merged with m_pGrfCB in CWS printerpullgpages
+ aAddPrinterAttr.bPrintControl = m_pCtrlFldCB->IsChecked();
+ aAddPrinterAttr.bPrintPageBackground = m_pBackgroundCB->IsChecked();
+ aAddPrinterAttr.bPrintBlackFont = m_pBlackFontCB->IsChecked();
+ aAddPrinterAttr.bPrintHiddenText = m_pPrintHiddenTextCB->IsChecked();
+ aAddPrinterAttr.bPrintTextPlaceholder = m_pPrintTextPlaceholderCB->IsChecked();
+
+ aAddPrinterAttr.bPrintLeftPages = m_pLeftPageCB->IsChecked();
+ aAddPrinterAttr.bPrintRightPages = m_pRightPageCB->IsChecked();
aAddPrinterAttr.bPrintReverse = sal_False; // handled by vcl itself since CWS printerpullpages /*aReverseCB.IsChecked()*/;
- aAddPrinterAttr.bPrintProspect = aProspectCB.IsChecked();
- aAddPrinterAttr.bPrintProspectRTL = aProspectCB_RTL.IsChecked();
- aAddPrinterAttr.bPaperFromSetup = aPaperFromSetupCB.IsChecked();
- aAddPrinterAttr.bPrintEmptyPages = aPrintEmptyPagesCB.IsChecked();
+ aAddPrinterAttr.bPrintProspect = m_pProspectCB->IsChecked();
+ aAddPrinterAttr.bPrintProspectRTL = m_pProspectCB_RTL->IsChecked();
+ aAddPrinterAttr.bPaperFromSetup = m_pPaperFromSetupCB->IsChecked();
+ aAddPrinterAttr.bPrintEmptyPages = m_pPrintEmptyPagesCB->IsChecked();
aAddPrinterAttr.bPrintSingleJobs = sal_True; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
- if (aNoRB.IsChecked()) aAddPrinterAttr.nPrintPostIts =
+ if (m_pNoRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
POSTITS_NONE;
- if (aOnlyRB.IsChecked()) aAddPrinterAttr.nPrintPostIts =
+ if (m_pOnlyRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
POSTITS_ONLY;
- if (aEndRB.IsChecked()) aAddPrinterAttr.nPrintPostIts =
+ if (m_pEndRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
POSTITS_ENDDOC;
- if (aEndPageRB.IsChecked()) aAddPrinterAttr.nPrintPostIts =
+ if (m_pEndPageRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
POSTITS_ENDPAGE;
- String sFax = aFaxLB.GetSelectEntry();
+ String sFax = m_pFaxLB->GetSelectEntry();
aAddPrinterAttr.sFaxName = sNone == sFax ? aEmptyStr : sFax;
rCoreSet.Put(aAddPrinterAttr);
}
@@ -439,35 +417,35 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet& )
if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , sal_False,
(const SfxPoolItem**)&pAddPrinterAttr ))
{
- aGrfCB.Check( pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw );
- aCtrlFldCB.Check( pAddPrinterAttr->bPrintControl);
- aBackgroundCB.Check( pAddPrinterAttr->bPrintPageBackground);
- aBlackFontCB.Check( pAddPrinterAttr->bPrintBlackFont);
- aPrintHiddenTextCB.Check( pAddPrinterAttr->bPrintHiddenText);
- aPrintTextPlaceholderCB.Check(pAddPrinterAttr->bPrintTextPlaceholder);
- aLeftPageCB.Check( pAddPrinterAttr->bPrintLeftPages);
- aRightPageCB.Check( pAddPrinterAttr->bPrintRightPages);
- aPaperFromSetupCB.Check(pAddPrinterAttr->bPaperFromSetup);
- aPrintEmptyPagesCB.Check(pAddPrinterAttr->bPrintEmptyPages);
- aProspectCB.Check( pAddPrinterAttr->bPrintProspect);
- aProspectCB_RTL.Check( pAddPrinterAttr->bPrintProspectRTL);
-
- aNoRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_NONE ) ;
- aOnlyRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ONLY ) ;
- aEndRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ENDDOC ) ;
- aEndPageRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ENDPAGE ) ;
- aFaxLB.SelectEntry( pAddPrinterAttr->sFaxName );
- }
- if (aProspectCB.IsChecked())
- {
- aProspectCB_RTL.Enable(sal_True);
- aNoRB.Enable( sal_False );
- aOnlyRB.Enable( sal_False );
- aEndRB.Enable( sal_False );
- aEndPageRB.Enable( sal_False );
+ m_pGrfCB->Check(pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw);
+ m_pCtrlFldCB->Check( pAddPrinterAttr->bPrintControl);
+ m_pBackgroundCB->Check( pAddPrinterAttr->bPrintPageBackground);
+ m_pBlackFontCB->Check( pAddPrinterAttr->bPrintBlackFont);
+ m_pPrintHiddenTextCB->Check( pAddPrinterAttr->bPrintHiddenText);
+ m_pPrintTextPlaceholderCB->Check(pAddPrinterAttr->bPrintTextPlaceholder);
+ m_pLeftPageCB->Check( pAddPrinterAttr->bPrintLeftPages);
+ m_pRightPageCB->Check( pAddPrinterAttr->bPrintRightPages);
+ m_pPaperFromSetupCB->Check(pAddPrinterAttr->bPaperFromSetup);
+ m_pPrintEmptyPagesCB->Check(pAddPrinterAttr->bPrintEmptyPages);
+ m_pProspectCB->Check( pAddPrinterAttr->bPrintProspect);
+ m_pProspectCB_RTL->Check( pAddPrinterAttr->bPrintProspectRTL);
+
+ m_pNoRB->Check (pAddPrinterAttr->nPrintPostIts== POSTITS_NONE ) ;
+ m_pOnlyRB->Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ONLY ) ;
+ m_pEndRB->Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ENDDOC ) ;
+ m_pEndPageRB->Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ENDPAGE ) ;
+ m_pFaxLB->SelectEntry( pAddPrinterAttr->sFaxName );
+ }
+ if (m_pProspectCB->IsChecked())
+ {
+ m_pProspectCB_RTL->Enable(sal_True);
+ m_pNoRB->Enable( sal_False );
+ m_pOnlyRB->Enable( sal_False );
+ m_pEndRB->Enable( sal_False );
+ m_pEndPageRB->Enable( sal_False );
}
else
- aProspectCB_RTL.Enable( sal_False );
+ m_pProspectCB_RTL->Enable( sal_False );
}
void SwAddPrinterTabPage::Init()
@@ -478,26 +456,26 @@ void SwAddPrinterTabPage::Init()
IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, AutoClickHdl)
{
bAttrModified = sal_True;
- bool bIsProspect = aProspectCB.IsChecked();
+ bool bIsProspect = m_pProspectCB->IsChecked();
if (!bIsProspect)
- aProspectCB_RTL.Check( sal_False );
- aProspectCB_RTL.Enable( bIsProspect );
- aNoRB.Enable( !bIsProspect );
- aOnlyRB.Enable( !bIsProspect );
- aEndRB.Enable( !bIsProspect );
- aEndPageRB.Enable( !bIsProspect );
+ m_pProspectCB_RTL->Check( sal_False );
+ m_pProspectCB_RTL->Enable( bIsProspect );
+ m_pNoRB->Enable( !bIsProspect );
+ m_pOnlyRB->Enable( !bIsProspect );
+ m_pEndRB->Enable( !bIsProspect );
+ m_pEndPageRB->Enable( !bIsProspect );
return 0;
}
IMPL_LINK_NOARG_INLINE_END(SwAddPrinterTabPage, AutoClickHdl)
void SwAddPrinterTabPage::SetFax( const std::vector<String>& rFaxLst )
{
- aFaxLB.InsertEntry(sNone);
+ m_pFaxLB->InsertEntry(sNone);
for(size_t i = 0; i < rFaxLst.size(); ++i)
{
- aFaxLB.InsertEntry(rFaxLst[i]);
+ m_pFaxLB->InsertEntry(rFaxLst[i]);
}
- aFaxLB.SelectEntryPos(0);
+ m_pFaxLB->SelectEntryPos(0);
}
IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, SelectHdl)
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index ae8222fff86e..8ec670f85e93 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -34,6 +34,7 @@
#include <vector>
#include <boost/scoped_ptr.hpp>
#include <mmaddressblockpage.hrc>
+#include <globals.hrc>
#include <dbui.hrc>
#include <helpid.h>
@@ -1252,7 +1253,7 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
#ifdef MSC
#pragma warning (default : 4355)
#endif
- m_sNone(SW_RES(ST_NONE)),
+ m_sNone(SW_RESSTR(SW_STR_NONE)),
m_rPreviewString(rPreview),
m_rConfigItem(rConfigItem)
{
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hrc b/sw/source/ui/dbui/mmaddressblockpage.hrc
index 7a49c8ee16a5..a05f7acc9ddc 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hrc
+++ b/sw/source/ui/dbui/mmaddressblockpage.hrc
@@ -98,7 +98,6 @@
#define FT_FIELDS 5
#define LB_FIELDS 6
#define FT_PREVIEW 7
-#define ST_NONE 8
#define WIN_DATA 9
#endif
diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src
index 4b556d5b9d9c..ff91ca9c4558 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ b/sw/source/ui/dbui/mmaddressblockpage.src
@@ -630,8 +630,4 @@ ModalDialog DLG_MM_ASSIGNFIELDS
{
Text[ en-US ] = "Preview" ;
};
- String ST_NONE
- {
- Text [en-US] = "< none >";
- };
};
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index e18bc3b6b616..1948dacd6324 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -87,38 +87,29 @@ public:
--------------------------------------------------------- */
class SwAddPrinterTabPage : public SfxTabPage
{
- FixedLine aFL1;
- CheckBox aGrfCB;
-// CheckBox aTabCB;
-// CheckBox aDrawCB;
- CheckBox aCtrlFldCB;
- CheckBox aBackgroundCB;
- CheckBox aBlackFontCB;
- CheckBox aPrintHiddenTextCB;
- CheckBox aPrintTextPlaceholderCB;
-
- FixedLine aSeparatorLFL;
-
- FixedLine aFL2;
- CheckBox aLeftPageCB;
- CheckBox aRightPageCB;
-// CheckBox aReverseCB;
- CheckBox aProspectCB;
- CheckBox aProspectCB_RTL;
-
- FixedLine aSeparatorRFL;
-
- FixedLine aFL3;
- RadioButton aNoRB;
- RadioButton aOnlyRB;
- RadioButton aEndRB;
- RadioButton aEndPageRB;
- FixedLine aFL4;
- CheckBox aPrintEmptyPagesCB;
-// CheckBox aSingleJobsCB;
- CheckBox aPaperFromSetupCB;
- FixedText aFaxFT;
- ListBox aFaxLB;
+ CheckBox* m_pGrfCB;
+ CheckBox* m_pCtrlFldCB;
+ CheckBox* m_pBackgroundCB;
+ CheckBox* m_pBlackFontCB;
+ CheckBox* m_pPrintHiddenTextCB;
+ CheckBox* m_pPrintTextPlaceholderCB;
+
+ VclFrame* m_pPagesFrame;
+ CheckBox* m_pLeftPageCB;
+ CheckBox* m_pRightPageCB;
+ CheckBox* m_pProspectCB;
+ CheckBox* m_pProspectCB_RTL;
+
+ VclFrame* m_pCommentsFrame;
+ RadioButton* m_pNoRB;
+ RadioButton* m_pOnlyRB;
+ RadioButton* m_pEndRB;
+ RadioButton* m_pEndPageRB;
+
+ CheckBox* m_pPrintEmptyPagesCB;
+ CheckBox* m_pPaperFromSetupCB;
+ ListBox* m_pFaxLB;
+
String sNone;
sal_Bool bAttrModified;
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 48cfd5cfa712..0afcc8ab4d87 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -420,7 +420,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "OutlineNumberingPage",
"modules/swriter/ui/outlinenumberingpage.ui", rSet)
- , aNoFmtName(SW_RES(STR_NO_COLL))
+ , aNoFmtName(SW_RESSTR(SW_STR_NONE))
, pSh(0)
, pCollNames(0)
, nActLevel(1)
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index ac9293d2a445..7cb69a460193 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -206,7 +206,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
// Separator style
aLineTypeBox.SetSourceUnit( FUNIT_TWIP );
- aLineTypeBox.SetNone( String( SW_RES( STR_NONE ) ) );
+ aLineTypeBox.SetNone(SW_RESSTR(SW_STR_NONE));
aLineTypeBox.InsertEntry(
::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::SOLID),
table::BorderLineStyle::SOLID );
diff --git a/sw/uiconfig/swriter/ui/printoptions.ui b/sw/uiconfig/swriter/ui/printoptions.ui
deleted file mode 100644
index 4a9a32782ed1..000000000000
--- a/sw/uiconfig/swriter/ui/printoptions.ui
+++ /dev/null
@@ -1,555 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkWindow" id="Printer Options">
- <property name="can_focus">False</property>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">8</property>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">5</property>
- <child>
- <object class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <child>
- <object class="GtkCheckButton" id="11">
- <property name="label" translatable="yes">Pictures and objects</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="12">
- <property name="label" translatable="yes">Form controls</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="13">
- <property name="label" translatable="yes">Page background</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="14">
- <property name="label" translatable="yes">Print text in black</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="15">
- <property name="label" translatable="yes">Hidden text</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="16">
- <property name="label" translatable="yes">Text placeholder</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Contents</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <child>
- <object class="GtkCheckButton" id="17">
- <property name="label" translatable="yes">Left pages</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="18">
- <property name="label" translatable="yes">Right pages</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="19">
- <property name="label" translatable="yes">Broucher</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Pages</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <child>
- <object class="GtkRadioButton" id="101">
- <property name="label" translatable="yes">None</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="102">
- <property name="label" translatable="yes">Comments only</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="103">
- <property name="label" translatable="yes">End of documetnt </property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="104">
- <property name="label" translatable="yes">End of page</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Comments</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">8</property>
- <child>
- <object class="GtkGrid" id="grid7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">10</property>
- <child>
- <object class="GtkLabel" id="5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Fax </property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="10001">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="20">
- <property name="label" translatable="yes">Print automatically inserted blank pages</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="21">
- <property name="label" translatable="yes">paper tray from printer settings</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Other</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButtonBox" id="buttonbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
- <property name="layout_style">start</property>
- <child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>
diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui
new file mode 100644
index 000000000000..4f5119b72eaf
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/printoptionspage.ui
@@ -0,0 +1,509 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="PrintOptionsPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="graphics">
+ <property name="label" translatable="yes">Pictures and objects</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="formcontrols">
+ <property name="label" translatable="yes">Form controls</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="background">
+ <property name="label" translatable="yes">Page background</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="inblack">
+ <property name="label" translatable="yes">Print text in black</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="hiddentext">
+ <property name="label" translatable="yes">Hidden text</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="textplaceholder">
+ <property name="label" translatable="yes">Text placeholder</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Contents</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="pagesframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="leftpages">
+ <property name="label" translatable="yes">Left pages</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="rightpages">
+ <property name="label" translatable="yes">Right pages</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="brochure">
+ <property name="label" translatable="yes">Brochure</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="rtl">
+ <property name="label" translatable="yes">Right to Left</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">18</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Pages</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="commentsframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="none">
+ <property name="label" translatable="yes">None</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">only</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="only">
+ <property name="label" translatable="yes">Comments only</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="end">
+ <property name="label" translatable="yes">End of document</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">endpage</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="endpage">
+ <property name="label" translatable="yes">End of page</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">none</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Comments</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Fax </property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="fax">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="blankpages">
+ <property name="label" translatable="yes">Print automatically inserted blank pages</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="papertray">
+ <property name="label" translatable="yes">Paper tray from printer settings</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Other</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-15 06:16:47 +0000