[Libreoffice-commits] .: 13 commits - cui/uiconfig editeng/inc editeng/source filter/source officecfg/registry sc/uiconfig sd/source sd/uiconfig sfx2/uiconfig starmath/uiconfig svtools/inc svtools/uiconfig svx/inc svx/source sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk vcl/inc vcl/source vcl/uiconfig xmlreader/inc xmlreader/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 17 08:09:15 PDT 2012
cui/uiconfig/ui/charnamepage.ui | 34 +-
cui/uiconfig/ui/effectspage.ui | 4
cui/uiconfig/ui/insertoleobject.ui | 4
cui/uiconfig/ui/insertplugin.ui | 4
cui/uiconfig/ui/positionpage.ui | 11
cui/uiconfig/ui/twolinespage.ui | 6
cui/uiconfig/ui/zoomdialog.ui | 16 +
editeng/inc/editeng/svxfont.hxx | 3
editeng/source/items/svxfont.cxx | 9
filter/source/graphicfilter/itga/itga.cxx | 12 -
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 2
sc/uiconfig/scalc/ui/printeroptions.ui | 2
sd/source/ui/toolpanel/LayoutMenu.cxx | 2
sd/uiconfig/sdraw/ui/printeroptions.ui | 6
sd/uiconfig/simpress/ui/printeroptions.ui | 6
sfx2/uiconfig/ui/password.ui | 4
starmath/uiconfig/smath/ui/printeroptions.ui | 4
svtools/inc/svtools/valueset.hxx | 2
svtools/uiconfig/ui/graphicexport.ui | 26 +-
svx/inc/svx/numvset.hxx | 9
svx/source/dialog/svxbmpnumvalueset.cxx | 38 ++-
svx/source/svdraw/ActionDescriptionProvider.cxx | 6
sw/AllLangResTarget_sw.mk | 1
sw/UI_swriter.mk | 1
sw/inc/helpid.h | 2
sw/inc/swabstdlg.hxx | 3
sw/source/ui/app/app.src | 5
sw/source/ui/dialog/swdlgfact.cxx | 19 -
sw/source/ui/dialog/swdlgfact.hxx | 3
sw/source/ui/inc/app.hrc | 3
sw/source/ui/inc/insrule.hxx | 25 --
sw/source/ui/inc/misc.hrc | 1
sw/source/ui/inc/swvset.hxx | 4
sw/source/ui/misc/insrule.cxx | 80 +++---
sw/source/ui/misc/insrule.hrc | 26 --
sw/source/ui/misc/insrule.src | 68 -----
sw/source/ui/shells/textsh.cxx | 3
sw/uiconfig/sw/ui/20872.ui | 6
sw/uiconfig/sw/ui/20876.ui | 6
sw/uiconfig/swriter/ui/autoformattable.ui | 4
sw/uiconfig/swriter/ui/charurlpage.ui | 34 +-
sw/uiconfig/swriter/ui/columnwidth.ui | 2
sw/uiconfig/swriter/ui/converttexttable.ui | 4
sw/uiconfig/swriter/ui/horizontalrule.ui | 120 ++++++++++
sw/uiconfig/swriter/ui/insertbreak.ui | 2
sw/uiconfig/swriter/ui/inserttable.ui | 7
sw/uiconfig/swriter/ui/linenumbering.ui | 18 -
sw/uiconfig/swriter/ui/printeroptions.ui | 6
sw/uiconfig/swriter/ui/sortdialog.ui | 10
sw/uiconfig/swriter/ui/splittable.ui | 2
sw/uiconfig/swriter/ui/stringinput.ui | 3
sw/uiconfig/swriter/ui/titlepage.ui | 6
sw/uiconfig/swriter/ui/wordcount.ui | 4
vcl/inc/vcl/stdtext.hxx | 4
vcl/source/app/stdtext.cxx | 21 +
vcl/source/window/builder.cxx | 74 ++++++
vcl/uiconfig/ui/printdialog.ui | 14 -
xmlreader/inc/xmlreader/xmlreader.hxx | 6
xmlreader/source/xmlreader.cxx | 23 +
59 files changed, 482 insertions(+), 348 deletions(-)
New commits:
commit 47391fb13988f66b1ded3573d44920f2355d1308
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 16 23:25:59 2012 +0100
XubString->OUString
Change-Id: I45ddca425871eb19aabd9876b64c2e2dac5bc774
diff --git a/vcl/inc/vcl/stdtext.hxx b/vcl/inc/vcl/stdtext.hxx
index a9254c2..b6ae2d9 100644
--- a/vcl/inc/vcl/stdtext.hxx
+++ b/vcl/inc/vcl/stdtext.hxx
@@ -43,13 +43,13 @@ class Window;
#define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0)
#define STANDARD_TEXT_LAST STANDARD_TEXT_SERVICE_NOT_AVAILABLE
-rtl::OUString VCL_DLLPUBLIC GetStandardText( sal_uInt16 nStdText );
+OUString VCL_DLLPUBLIC GetStandardText(sal_uInt16 nStdText);
// -------------------------------------
// - Hilfsmethoden fuer Standard-Texte -
// -------------------------------------
-void VCL_DLLPUBLIC ShowServiceNotAvailableError( Window* pParent, const XubString& rServiceName, sal_Bool bError );
+void VCL_DLLPUBLIC ShowServiceNotAvailableError(Window* pParent, const OUString& rServiceName, bool bError);
#endif // _VCL_STDTEXT_HXX
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index d7d5e85..bd13f0d 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.cxx
@@ -36,22 +36,25 @@
// =======================================================================
-rtl::OUString GetStandardText( sal_uInt16 nStdText )
+OUString GetStandardText( sal_uInt16 nStdText )
{
ResMgr* pResMgr = ImplGetResMgr();
- if( pResMgr )
- return ResId(nStdText-STANDARD_TEXT_FIRST+SV_STDTEXT_FIRST, *pResMgr);
- return rtl::OUString();
+ if (pResMgr)
+ {
+ return ResId(nStdText-STANDARD_TEXT_FIRST+SV_STDTEXT_FIRST, *pResMgr).
+ toString();
+ }
+ return OUString();
}
// =======================================================================
-void ShowServiceNotAvailableError( Window* pParent,
- const XubString& rServiceName, sal_Bool bError )
+void ShowServiceNotAvailableError(Window* pParent,
+ const OUString& rServiceName, bool bError)
{
- XubString aText( GetStandardText( STANDARD_TEXT_SERVICE_NOT_AVAILABLE ) );
- aText.SearchAndReplaceAscii( "%s", rServiceName );
- if ( bError )
+ OUString aText = GetStandardText(STANDARD_TEXT_SERVICE_NOT_AVAILABLE).
+ replaceAll("%s", rServiceName);
+ if (bError)
{
ErrorBox aBox( pParent, WB_OK | WB_DEF_OK, aText );
aBox.Execute();
commit 46f1b3a5949e063953af635147acf748684c8e2f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 16 22:20:23 2012 +0100
default SwInsertGrfRulerDlg to first entry
Change-Id: I843afacf4bb6880ecd9848cae3fe6071439ed995
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 62d2c50..f875685 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -174,7 +174,7 @@ static snewfoil_value_info standard[] =
};
LayoutMenu::LayoutMenu( TreeNode* pParent, ToolPanelViewShell& i_rPanelViewShell )
- : ValueSet (pParent->GetWindow()),
+ : ValueSet(pParent->GetWindow(), WB_ITEMBORDER),
TreeNode(pParent),
DragSourceHelper(this),
DropTargetHelper(this),
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 24fa35e..3f3fa9f 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -296,7 +296,7 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
public:
- ValueSet( Window* pParent, WinBits nWinStyle = WB_ITEMBORDER, bool bDisableTransientChildren = false );
+ ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren = false );
ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false );
~ValueSet();
diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx
index 442addc..030f023 100644
--- a/svx/inc/svx/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
@@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
public:
SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType );
- SvxNumValueSet( Window* pParent, sal_uInt16 nType );
+ SvxNumValueSet( Window* pParent, WinBits nWinStyle, sal_uInt16 nType );
~SvxNumValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
@@ -108,7 +108,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
public:
SvxBmpNumValueSet(Window* pParent, const ResId& rResId);
- SvxBmpNumValueSet(Window* pParent);
+ SvxBmpNumValueSet(Window* pParent, WinBits nWinStyle);
~SvxBmpNumValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 741caf9..72063f9 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -408,8 +408,8 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16
init(nType);
}
-SvxNumValueSet::SvxNumValueSet( Window* pParent, sal_uInt16 nType )
- : ValueSet( pParent )
+SvxNumValueSet::SvxNumValueSet( Window* pParent, WinBits nWinStyle, sal_uInt16 nType )
+ : ValueSet( pParent, nWinStyle )
{
init(nType);
}
@@ -481,8 +481,8 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId )
init();
}
-SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent )
- : SvxNumValueSet( pParent, NUM_PAGETYPE_BMP )
+SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, WinBits nWinStyle )
+ : SvxNumValueSet( pParent, nWinStyle, NUM_PAGETYPE_BMP )
{
init();
}
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index bf78173..ca524fc 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -68,7 +68,6 @@
#define HID_VS_NUM "SW_HID_VS_NUM"
#define HID_VS_BULLET "SW_HID_VS_BULLET"
#define HID_VS_NUMBMP "SW_HID_VS_NUMBMP"
-#define HID_VS_RULER "SW_HID_VS_RULER"
#define HID_INSERT_ABSTRACT "SW_HID_INSERT_ABSTRACT"
#define HID_NAVI_TBX1 "SW_HID_NAVI_TBX1"
#define HID_NAVI_TBX2 "SW_HID_NAVI_TBX2"
diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx
index 78d3319..5d9f37e 100644
--- a/sw/source/ui/inc/insrule.hxx
+++ b/sw/source/ui/inc/insrule.hxx
@@ -31,26 +31,21 @@ class SwInsertGrfRulerDlg : public SfxModalDialog
OKButton* m_pOkPB;
SwRulerValueSet* m_pExampleVS;
- std::vector<String> aGrfNames;
- String sSimple;
- String sRulers;
- sal_uInt16 nSelPos;
+ std::vector<OUString> m_aGrfNames;
+ OUString m_sSimple;
protected:
- DECL_LINK(SelectHdl, ValueSet*);
DECL_LINK(DoubleClickHdl, void *);
public:
- SwInsertGrfRulerDlg( Window* pParent );
+ SwInsertGrfRulerDlg(Window* pParent);
~SwInsertGrfRulerDlg();
- String GetGraphicName();
- sal_Bool IsSimpleLine() {return nSelPos == 1;}
- sal_Bool HasImages() const {return !aGrfNames.empty();}
+ OUString GetGraphicName() const;
+ bool IsSimpleLine() const;
+ bool HasImages() const {return !m_aGrfNames.empty();}
};
#endif
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/swvset.hxx b/sw/source/ui/inc/swvset.hxx
index a4c59fc..7bc919d 100644
--- a/sw/source/ui/inc/swvset.hxx
+++ b/sw/source/ui/inc/swvset.hxx
@@ -23,9 +23,8 @@
class SwRulerValueSet : public SvxBmpNumValueSet
{
public:
- SwRulerValueSet( Window* pParent,
- const ResId& rResId );
- SwRulerValueSet( Window* pParent );
+ SwRulerValueSet(Window* pParent, const ResId& rResId);
+ SwRulerValueSet(Window* pParent, WinBits nWinStyle);
~SwRulerValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
};
diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx
index cfa0301..7b1b949 100644
--- a/sw/source/ui/misc/insrule.cxx
+++ b/sw/source/ui/misc/insrule.cxx
@@ -43,33 +43,29 @@
SwInsertGrfRulerDlg::SwInsertGrfRulerDlg( Window* pParent )
: SfxModalDialog(pParent, "HorizontalRuleDialog", "modules/swriter/ui/horizontalrule.ui")
- , sSimple(SW_RESSTR(STR_SIMPLE))
- , nSelPos(USHRT_MAX)
+ , m_sSimple(SW_RESSTR(STR_SIMPLE))
{
get(m_pOkPB, "ok");
get(m_pExampleVS, "rulers");
m_pExampleVS->SetLineCount(6);
m_pExampleVS->SetColCount(1);
- m_pExampleVS->SetSelectHdl(LINK(this, SwInsertGrfRulerDlg, SelectHdl));
m_pExampleVS->SetDoubleClickHdl(LINK(this, SwInsertGrfRulerDlg, DoubleClickHdl));
// determine graphic name
GalleryExplorer::BeginLocking(GALLERY_THEME_RULERS);
- GalleryExplorer::FillObjList( GALLERY_THEME_RULERS, aGrfNames );
- m_pExampleVS->SetHelpId(HID_VS_RULER);
+ GalleryExplorer::FillObjList(GALLERY_THEME_RULERS, m_aGrfNames);
Color aColor(COL_WHITE);
- m_pExampleVS->InsertItem( 1, 1);
- m_pExampleVS->SetItemText( 1, sSimple);
+ m_pExampleVS->InsertItem(1, 1);
+ m_pExampleVS->SetItemText(1, m_sSimple);
- for(sal_uInt16 i = 1; i <= aGrfNames.size(); i++)
+ for(sal_uInt16 i = 1; i <= m_aGrfNames.size(); ++i)
{
m_pExampleVS->InsertItem( i + 1, i);
- m_pExampleVS->SetItemText( i + 1, aGrfNames[i-1]);
+ m_pExampleVS->SetItemText( i + 1, m_aGrfNames[i-1]);
}
m_pExampleVS->SelectItem(1);
- m_pExampleVS->GrabFocus();
}
SwInsertGrfRulerDlg::~SwInsertGrfRulerDlg()
@@ -77,22 +73,22 @@ SwInsertGrfRulerDlg::~SwInsertGrfRulerDlg()
GalleryExplorer::EndLocking(GALLERY_THEME_RULERS);
}
-String SwInsertGrfRulerDlg::GetGraphicName()
+bool SwInsertGrfRulerDlg::IsSimpleLine() const
{
- String sRet;
- sal_uInt16 nSel = nSelPos - 2; //align selection position with ValueSet index
- if(nSel < aGrfNames.size())
- sRet = URIHelper::SmartRel2Abs(
- INetURLObject(), aGrfNames[nSel],
- URIHelper::GetMaybeFileHdl());
- return sRet;
+ return m_pExampleVS->GetSelectItemId() == 1;
}
-IMPL_LINK(SwInsertGrfRulerDlg, SelectHdl, ValueSet*, pVS)
+OUString SwInsertGrfRulerDlg::GetGraphicName() const
{
- nSelPos = pVS->GetSelectItemId();
- m_pOkPB->Enable();
- return 0;
+ sal_uInt16 nSelPos = m_pExampleVS->GetSelectItemId();
+
+ sal_uInt16 nSel = nSelPos - 2; //align selection position with ValueSet index
+ if(nSel < m_aGrfNames.size())
+ {
+ return URIHelper::SmartRel2Abs(INetURLObject(), m_aGrfNames[nSel],
+ URIHelper::GetMaybeFileHdl());
+ }
+ return OUString();
}
SwRulerValueSet::SwRulerValueSet( Window* pParent, const ResId& rResId )
@@ -101,15 +97,15 @@ SwRulerValueSet::SwRulerValueSet( Window* pParent, const ResId& rResId )
SetStyle(GetStyle() & ~WB_ITEMBORDER);
}
-SwRulerValueSet::SwRulerValueSet(Window* pParent)
- : SvxBmpNumValueSet(pParent)
+SwRulerValueSet::SwRulerValueSet(Window* pParent, WinBits nWinStyle)
+ : SvxBmpNumValueSet(pParent, nWinStyle)
{
SetStyle(GetStyle() & ~WB_ITEMBORDER);
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwRulerValueSet(Window *pParent, VclBuilder::stringmap &)
{
- return new SwRulerValueSet(pParent);
+ return new SwRulerValueSet(pParent, WB_ITEMBORDER | WB_TABSTOP);
}
SwRulerValueSet::~SwRulerValueSet()
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui
index 80a3eee..21fdda9 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -115,7 +115,8 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Name</property>
+ <property name="label" translatable="yes"><b>Name</b></property>
+ <property name="use_markup">True</property>
</object>
</child>
</object>
@@ -220,7 +221,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Size</property>
+ <property name="label" translatable="yes"><b>Size</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -389,7 +390,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.47999998927116394</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes"><b>Options</b></property>
<property name="use_markup">True</property>
</object>
</child>
commit 644d22e6765d961f6130affc84ace869d6fd5177
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 16 17:49:59 2012 +0100
convert insert rule
Change-Id: Ic4191a6dd38ef619efc4e4dc5ed6fe418c0942f4
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 8d7f4f8..5bb8873 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -156,7 +156,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/misc/glosbib.src \
sw/source/ui/misc/glossary.src \
sw/source/ui/misc/insfnote.src \
- sw/source/ui/misc/insrule.src \
sw/source/ui/misc/num.src \
sw/source/ui/misc/numberingtypelistbox.src \
sw/source/ui/misc/outline.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index fc53c25..9e35278 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/charurlpage \
sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/converttexttable \
+ sw/uiconfig/swriter/ui/horizontalrule \
sw/uiconfig/swriter/ui/insertbreak \
sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index a915108..bf78173 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -69,7 +69,6 @@
#define HID_VS_BULLET "SW_HID_VS_BULLET"
#define HID_VS_NUMBMP "SW_HID_VS_NUMBMP"
#define HID_VS_RULER "SW_HID_VS_RULER"
-#define HID_RULER_DIALOG "SW_HID_RULER_DIALOG"
#define HID_INSERT_ABSTRACT "SW_HID_INSERT_ABSTRACT"
#define HID_NAVI_TBX1 "SW_HID_NAVI_TBX1"
#define HID_NAVI_TBX2 "SW_HID_NAVI_TBX2"
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 5f12fa8..056f3a2 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -444,8 +444,7 @@ public:
virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0;
virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, sal_Bool bCol = sal_False ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
- Window * pParent ) = 0; //add for SwInsertGrfRulerDlg
+ virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg(Window * pParent) = 0; //add for SwInsertGrfRulerDlg
virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) = 0; //add for SwInsTableDlg
virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId,
Window* pParent, SwWrtShell* pWrtSh ) = 0; //add for SwJavaEditDialog
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 99d63e9..3492f9e 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -655,6 +655,11 @@ String STR_COL
Text [ en-US ] = "Column" ;
};
+String STR_SIMPLE
+{
+ Text [ en-US ] = "Plain" ;
+};
+
ToolBox RID_MODULE_TOOLBOX
{
HelpID = HID_MODULE_TOOLBOX ;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 09dbd3f..a851292 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1243,22 +1243,11 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nRe
return 0;
}
-AbstractInsertGrfRulerDlg * SwAbstractDialogFactory_Impl::CreateInsertGrfRulerDlg( int nResId,
- Window * pParent ) //add for SwInsertGrfRulerDlg
+//add for SwInsertGrfRulerDlg
+AbstractInsertGrfRulerDlg * SwAbstractDialogFactory_Impl::CreateInsertGrfRulerDlg(Window * pParent)
{
- SwInsertGrfRulerDlg* pDlg=NULL;
- switch ( nResId )
- {
- case DLG_INSERT_RULER :
- pDlg = new SwInsertGrfRulerDlg( pParent );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractInsertGrfRulerDlg_Impl( pDlg );
- return 0;
+ SwInsertGrfRulerDlg* pDlg = new SwInsertGrfRulerDlg(pParent);
+ return new AbstractInsertGrfRulerDlg_Impl(pDlg);
}
AbstractInsTableDlg * SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rView) //add for SwInsTableDlg
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index f176439..129b9e3 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -523,8 +523,7 @@ public:
virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, sal_Bool bCol = sal_False ); //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
- Window * pParent ); //add for SwInsertGrfRulerDlg
+ virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg(Window * pParent); //add for SwInsertGrfRulerDlg
virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView); //add for SwInsTableDlg
virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId,
Window* pParent, SwWrtShell* pWrtSh ); //add for SwJavaEditDialog
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 1e92427..565fa38 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -114,8 +114,9 @@
#define STR_NUMERIC (RC_APP_BEGIN + 126)
#define STR_COL (RC_APP_BEGIN + 127)
#define STR_ROW (RC_APP_BEGIN + 128)
+#define STR_SIMPLE (RC_APP_BEGIN + 129)
-#define APP_ACT_END STR_ROW
+#define APP_ACT_END STR_SIMPLE
#if APP_ACT_END > RC_APP_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx
index 77a13c7..78d3319 100644
--- a/sw/source/ui/inc/insrule.hxx
+++ b/sw/source/ui/inc/insrule.hxx
@@ -28,18 +28,14 @@ class ValueSet;
class SwInsertGrfRulerDlg : public SfxModalDialog
{
- FixedLine aSelectionFL;
- OKButton aOkPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
+ OKButton* m_pOkPB;
+ SwRulerValueSet* m_pExampleVS;
std::vector<String> aGrfNames;
String sSimple;
String sRulers;
sal_uInt16 nSelPos;
- SwRulerValueSet* pExampleVS;
-
protected:
DECL_LINK(SelectHdl, ValueSet*);
DECL_LINK(DoubleClickHdl, void *);
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc
index 4bfbfe5..ebaae15 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/ui/inc/misc.hrc
@@ -31,7 +31,6 @@
#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18)
#define DLG_SORTING (RC_MISC_BEGIN + 19)
#define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25)
-#define DLG_INSERT_RULER (RC_MISC_BEGIN + 28)
#define DLG_REDLINE_ACCEPT (RC_MISC_BEGIN + 29)
#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31)
diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx
index eecd57a..cfa0301 100644
--- a/sw/source/ui/misc/insrule.cxx
+++ b/sw/source/ui/misc/insrule.cxx
@@ -37,49 +37,44 @@
#include "docsh.hxx"
#include "insrule.hxx"
#include "swvset.hxx"
-#include "insrule.hrc"
+#include "app.hrc"
#include "misc.hrc"
#include "helpid.h"
-SwInsertGrfRulerDlg::SwInsertGrfRulerDlg( Window* pParent ) :
- SfxModalDialog(pParent, SW_RES(DLG_INSERT_RULER)),
- aSelectionFL(this, SW_RES(FL_SEL )),
- aOkPB (this, SW_RES(PB_OK )),
- aCancelPB (this, SW_RES(PB_CANCEL )),
- aHelpPB (this, SW_RES(PB_HELP )),
-
- sSimple (SW_RES(ST_SIMPLE)),
- nSelPos(USHRT_MAX),
- pExampleVS (new SwRulerValueSet(this, SW_RES(VS_EXAMPLE )))
+SwInsertGrfRulerDlg::SwInsertGrfRulerDlg( Window* pParent )
+ : SfxModalDialog(pParent, "HorizontalRuleDialog", "modules/swriter/ui/horizontalrule.ui")
+ , sSimple(SW_RESSTR(STR_SIMPLE))
+ , nSelPos(USHRT_MAX)
{
- FreeResource();
- pExampleVS->SetLineCount(6);
- pExampleVS->SetColCount(1);
- pExampleVS->SetSelectHdl(LINK(this, SwInsertGrfRulerDlg, SelectHdl));
- pExampleVS->SetDoubleClickHdl(LINK(this, SwInsertGrfRulerDlg, DoubleClickHdl));
- pExampleVS->GrabFocus();
+ get(m_pOkPB, "ok");
+ get(m_pExampleVS, "rulers");
+
+ m_pExampleVS->SetLineCount(6);
+ m_pExampleVS->SetColCount(1);
+ m_pExampleVS->SetSelectHdl(LINK(this, SwInsertGrfRulerDlg, SelectHdl));
+ m_pExampleVS->SetDoubleClickHdl(LINK(this, SwInsertGrfRulerDlg, DoubleClickHdl));
// determine graphic name
GalleryExplorer::BeginLocking(GALLERY_THEME_RULERS);
GalleryExplorer::FillObjList( GALLERY_THEME_RULERS, aGrfNames );
- pExampleVS->SetHelpId(HID_VS_RULER);
+ m_pExampleVS->SetHelpId(HID_VS_RULER);
Color aColor(COL_WHITE);
- pExampleVS->InsertItem( 1, 1);
- pExampleVS->SetItemText( 1, sSimple);
+ m_pExampleVS->InsertItem( 1, 1);
+ m_pExampleVS->SetItemText( 1, sSimple);
for(sal_uInt16 i = 1; i <= aGrfNames.size(); i++)
{
- pExampleVS->InsertItem( i + 1, i);
- pExampleVS->SetItemText( i + 1, aGrfNames[i-1]);
+ m_pExampleVS->InsertItem( i + 1, i);
+ m_pExampleVS->SetItemText( i + 1, aGrfNames[i-1]);
}
- pExampleVS->Show();
+ m_pExampleVS->SelectItem(1);
+ m_pExampleVS->GrabFocus();
}
SwInsertGrfRulerDlg::~SwInsertGrfRulerDlg()
{
GalleryExplorer::EndLocking(GALLERY_THEME_RULERS);
- delete pExampleVS;
}
String SwInsertGrfRulerDlg::GetGraphicName()
@@ -96,7 +91,7 @@ String SwInsertGrfRulerDlg::GetGraphicName()
IMPL_LINK(SwInsertGrfRulerDlg, SelectHdl, ValueSet*, pVS)
{
nSelPos = pVS->GetSelectItemId();
- aOkPB.Enable();
+ m_pOkPB->Enable();
return 0;
}
diff --git a/sw/source/ui/misc/insrule.hrc b/sw/source/ui/misc/insrule.hrc
deleted file mode 100644
index d9aaa36..0000000
--- a/sw/source/ui/misc/insrule.hrc
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "misc.hrc"
-
-#define FL_SEL 1
-#define VS_EXAMPLE 2
-#define PB_OK 3
-#define PB_CANCEL 4
-#define PB_HELP 5
-#define ST_SIMPLE 6
diff --git a/sw/source/ui/misc/insrule.src b/sw/source/ui/misc/insrule.src
deleted file mode 100644
index e419907..0000000
--- a/sw/source/ui/misc/insrule.src
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "insrule.hrc"
-#include "helpid.h"
-ModalDialog DLG_INSERT_RULER
-{
- HelpID = HID_RULER_DIALOG ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 242 , 124 ) ;
- Moveable = TRUE ;
- FixedLine FL_SEL
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 174 , 8 ) ;
- Text [ en-US ] = "Selection" ;
- };
- Control VS_EXAMPLE
- {
- Pos = MAP_APPFONT ( 9 , 14 ) ;
- Size = MAP_APPFONT ( 168 , 104 ) ;
- Hide = TRUE ;
- Border = TRUE ;
- TabStop = TRUE ;
- Group = TRUE ;
- };
- OKButton PB_OK
- {
- Pos = MAP_APPFONT ( 186 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- Disable = TRUE ;
- };
- CancelButton PB_CANCEL
- {
- Pos = MAP_APPFONT ( 186 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton PB_HELP
- {
- Pos = MAP_APPFONT ( 186 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- String ST_SIMPLE
- {
- Text [ en-US ] = "Plain" ;
- };
- Text [ en-US ] = "Insert Horizontal Rule" ;
-};
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 40d93fc..f282e5f 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -660,8 +660,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
- AbstractInsertGrfRulerDlg* pDlg = pFact->CreateInsertGrfRulerDlg( DLG_INSERT_RULER,
- pParent );
+ AbstractInsertGrfRulerDlg* pDlg = pFact->CreateInsertGrfRulerDlg(pParent);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
// MessageBox fuer fehlende Grafiken
if(!pDlg->HasImages())
diff --git a/sw/uiconfig/swriter/ui/horizontalrule.ui b/sw/uiconfig/swriter/ui/horizontalrule.ui
new file mode 100644
index 0000000..a885114
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/horizontalrule.ui
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="HorizontalRuleDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Insert Horizontal Rule</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</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="can_default">True</property>
+ <property name="has_default">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="button2">
+ <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="pack_type">end</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="swuilo:SwRulerValueSet" id="rulers">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="width_request">400</property>
+ <property name="height_request">250</property>
+ </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"><b>Selection</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">button2</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit de661fd70a33010ff455a3909020c8df346b5743
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 16 16:36:19 2012 +0100
add a makeSwRulerValueSet for custom SwRulerValueSet widget
Change-Id: Id13086906e2f66de45356baa7593b6d0e7657714
diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx
index 5466444..442addc 100644
--- a/svx/inc/svx/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
@@ -64,8 +64,12 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
com::sun::star::uno::Sequence<
com::sun::star::uno::Reference<
com::sun::star::container::XIndexAccess> > aOutlineSettings;
+
+ void init(sal_uInt16 nType);
+
public:
SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType );
+ SvxNumValueSet( Window* pParent, sal_uInt16 nType );
~SvxNumValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
@@ -92,6 +96,8 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
Timer aFormatTimer;
sal_Bool bGrfNotFound;
+ void init();
+
protected:
DECL_LINK(FormatHdl_Impl, void *);
@@ -101,7 +107,8 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
Timer& GetFormatTimer() {return aFormatTimer;}
public:
- SvxBmpNumValueSet( Window* pParent, const ResId& rResId);
+ SvxBmpNumValueSet(Window* pParent, const ResId& rResId);
+ SvxBmpNumValueSet(Window* pParent);
~SvxBmpNumValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 13a2e34..741caf9 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -402,15 +402,25 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
pDev->SetLineColor(aOldColor);
}
-SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ) :
+SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType )
+ : ValueSet( pParent, rResId )
+{
+ init(nType);
+}
- ValueSet( pParent, rResId ),
+SvxNumValueSet::SvxNumValueSet( Window* pParent, sal_uInt16 nType )
+ : ValueSet( pParent )
+{
+ init(nType);
+}
- aLineColor ( COL_LIGHTGRAY ),
- nPageType ( nType ),
- bHTMLMode ( sal_False ),
- pVDev ( NULL )
+void SvxNumValueSet::init(sal_uInt16 nType)
{
+ aLineColor = COL_LIGHTGRAY;
+ nPageType = nType;
+ bHTMLMode = sal_False;
+ pVDev = NULL;
+
SetColCount( 4 );
SetLineCount( 2 );
SetStyle( GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER );
@@ -465,12 +475,21 @@ void SvxNumValueSet::SetOutlineNumberingSettings(
}
}
-SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId ) :
+SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId )
+ : SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP )
+{
+ init();
+}
- SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ),
- bGrfNotFound( sal_False )
+SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent )
+ : SvxNumValueSet( pParent, NUM_PAGETYPE_BMP )
+{
+ init();
+}
+void SvxBmpNumValueSet::init()
{
+ bGrfNotFound = sal_False;
GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
SetStyle( GetStyle() | WB_VSCROLL );
SetLineCount( 3 );
@@ -478,6 +497,7 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId ) :
aFormatTimer.SetTimeoutHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl));
}
+
SvxBmpNumValueSet::~SvxBmpNumValueSet()
{
GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS);
diff --git a/sw/source/ui/inc/swvset.hxx b/sw/source/ui/inc/swvset.hxx
index f2c8725..a4c59fc 100644
--- a/sw/source/ui/inc/swvset.hxx
+++ b/sw/source/ui/inc/swvset.hxx
@@ -25,6 +25,7 @@ class SwRulerValueSet : public SvxBmpNumValueSet
public:
SwRulerValueSet( Window* pParent,
const ResId& rResId );
+ SwRulerValueSet( Window* pParent );
~SwRulerValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
};
diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx
index 4d865e6..eecd57a 100644
--- a/sw/source/ui/misc/insrule.cxx
+++ b/sw/source/ui/misc/insrule.cxx
@@ -100,10 +100,21 @@ IMPL_LINK(SwInsertGrfRulerDlg, SelectHdl, ValueSet*, pVS)
return 0;
}
-SwRulerValueSet::SwRulerValueSet( Window* pParent, const ResId& rResId ) :
- SvxBmpNumValueSet(pParent, rResId)
+SwRulerValueSet::SwRulerValueSet( Window* pParent, const ResId& rResId )
+ : SvxBmpNumValueSet(pParent, rResId)
{
- SetStyle( GetStyle() & ~WB_ITEMBORDER );
+ SetStyle(GetStyle() & ~WB_ITEMBORDER);
+}
+
+SwRulerValueSet::SwRulerValueSet(Window* pParent)
+ : SvxBmpNumValueSet(pParent)
+{
+ SetStyle(GetStyle() & ~WB_ITEMBORDER);
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwRulerValueSet(Window *pParent, VclBuilder::stringmap &)
+{
+ return new SwRulerValueSet(pParent);
}
SwRulerValueSet::~SwRulerValueSet()
commit c648d4287877f62554cb4f940d565833fb46a2b3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 16 10:29:01 2012 +0100
annoying border/child window confusion
Change-Id: I6ab919ff326a8525d1bed7db6474764de4e5bcf0
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5e66858..073be0d 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1569,10 +1569,17 @@ OString VclBuilder::get_by_window(const Window *pWindow) const
sal_Int32 VclBuilder::get_window_packing_position(const Window *pWindow) const
{
+ //We've stored the return of new Control, some of these get
+ //border windows placed around them which are what you get
+ //from GetChild, so scoot up a level if necessary to get the
+ //window whose position value we have
+ const Window *pPropHolder = pWindow->mpWindowImpl->mpClientWindow ?
+ pWindow->mpWindowImpl->mpClientWindow : pWindow;
+
for (std::vector<WinAndId>::const_iterator aI = m_aChildren.begin(),
aEnd = m_aChildren.end(); aI != aEnd; ++aI)
{
- if (aI->m_pWindow == pWindow)
+ if (aI->m_pWindow == pPropHolder)
return aI->m_nPosition;
}
commit 4a057fdc4ca967d22130ae323b2327e5679fecd5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 16 00:57:17 2012 +0100
XubString->OUString
Change-Id: Ie66f747242c7304a7ad9628fcc18c4315178eccb
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index 5544171..af0a1f2 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -65,10 +65,8 @@
if(!nResID)
return rtl::OUString();
- XubString aStr(ImpGetResStr(nResID));
- XubString aName(rObjectName);
- aStr.SearchAndReplaceAscii("%1", aName);
- return rtl::OUString(aStr);
+ OUString aStr(ImpGetResStr(nResID));
+ return aStr.replaceAll("%1", rObjectName);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3fa67908de71b0e463d0186754a8bc231ec1922d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 16 00:46:18 2012 +0100
ditch rather pointless REDUCEDSVXFONT
Change-Id: Ie49265fbcd9d608de0017cdc599cb5054f7cced2
diff --git a/editeng/inc/editeng/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx
index 96729e9..62da119 100644
--- a/editeng/inc/editeng/svxfont.hxx
+++ b/editeng/inc/editeng/svxfont.hxx
@@ -84,8 +84,6 @@ public:
// Consider Upper case, Lower case letters etc.
OUString CalcCaseMap(const OUString &rTxt) const;
-// The following section is not needed by anyone, so it can be excluded.
-#ifndef REDUCEDSVXFONT
// Handle upper case letters
void DoOnCapitals( SvxDoCapitals &rDo,
const sal_uInt16 nPartLen = USHRT_MAX ) const;
@@ -116,7 +114,6 @@ public:
const Point &rPos, const String &rTxt,
const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ) const;
-#endif // !REDUCEDSVXFONT
static void DrawArrow( OutputDevice &rOut, const Rectangle& rRect,
const Size& rSize, const Color& rCol, sal_Bool bLeft );
SvxFont& operator=( const SvxFont& rFont );
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 5f8745d..33ad640 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -168,12 +168,6 @@ OUString SvxFont::CalcCaseMap(const OUString &rTxt) const
}
/*************************************************************************
-* Starting form here are the methods that can not be used in Writer,
-* so we put this section to be excluded by REDUCEDSVXFONT.
- *************************************************************************/
-#ifndef REDUCEDSVXFONT
-
-/*************************************************************************
* class SvxDoCapitals
* The virtual Method Do si called by SvxFont::DoOnCapitals alternately
* the uppercase and lowercase parts. The derivate of SvxDoCapitals fills
@@ -767,7 +761,4 @@ void SvxFont::DrawCapital( OutputDevice *pOut,
DoOnCapitals( aDo );
}
-#endif // !REDUCEDSVXFONT
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8274df85dffad4bb3e87579e4c6e9c204ff60ebe
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 16 00:20:04 2012 +0100
make use of ability to use bold in labels
Change-Id: I3989d552ef286ba2e63cbd2a9fee32a8358ca74c
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index aebb93a..6f82525 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -97,18 +97,6 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="svtlo:FontNameBox" id="westfontnamelb-nocjk">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -148,6 +136,18 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -156,7 +156,7 @@
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Font</property>
+ <property name="label" translatable="yes"><b>Font</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -305,7 +305,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Western text font</property>
+ <property name="label" translatable="yes"><b>Western text font</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -454,7 +454,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Asian text font</property>
+ <property name="label" translatable="yes"><b>Asian text font</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -603,7 +603,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">CTL font</property>
+ <property name="label" translatable="yes"><b>CTL font</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -638,7 +638,7 @@
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Preview</property>
+ <property name="label" translatable="yes"><b>Preview</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 1ce3890..0fe4462 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -617,7 +617,7 @@
<object class="GtkLabel" id="label42">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes"><b>Options</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -652,7 +652,7 @@
<object class="GtkLabel" id="label50">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Preview</property>
+ <property name="label" translatable="yes"><b>Preview</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/cui/uiconfig/ui/insertoleobject.ui b/cui/uiconfig/ui/insertoleobject.ui
index db75639..c41ea5b 100644
--- a/cui/uiconfig/ui/insertoleobject.ui
+++ b/cui/uiconfig/ui/insertoleobject.ui
@@ -90,7 +90,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Object type</property>
+ <property name="label" translatable="yes"><b>Object type</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -173,7 +173,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">File</property>
+ <property name="label" translatable="yes"><b>File</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/cui/uiconfig/ui/insertplugin.ui b/cui/uiconfig/ui/insertplugin.ui
index 58a87b2..ef3ac40 100644
--- a/cui/uiconfig/ui/insertplugin.ui
+++ b/cui/uiconfig/ui/insertplugin.ui
@@ -69,7 +69,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">File/URL</property>
+ <property name="label" translatable="yes"><b>File/URL</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -117,7 +117,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes"><b>Options</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui
index 2dd1401..64bb40b 100644
--- a/cui/uiconfig/ui/positionpage.ui
+++ b/cui/uiconfig/ui/positionpage.ui
@@ -210,7 +210,7 @@
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Position</property>
+ <property name="label" translatable="yes"><b>Position</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -370,7 +370,7 @@
<object class="GtkLabel" id="rotateandscale">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Rotation / Scaling</property>
+ <property name="label" translatable="yes"><b>Rotation / Scaling</b></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -384,7 +384,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Rotation</property>
+ <property name="label" translatable="yes"><b>Rotation</b></property>
+ <property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -481,7 +482,7 @@
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Spacing</property>
+ <property name="label" translatable="yes"><b>Spacing</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -516,7 +517,7 @@
<object class="GtkLabel" id="label51">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Preview</property>
+ <property name="label" translatable="yes"><b>Preview</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui
index f61c424..acf2092 100644
--- a/cui/uiconfig/ui/twolinespage.ui
+++ b/cui/uiconfig/ui/twolinespage.ui
@@ -34,7 +34,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Double-lined</property>
+ <property name="label" translatable="yes"><b>Double-lined</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -130,7 +130,7 @@
<object class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Enclosing character</property>
+ <property name="label" translatable="yes"><b>Enclosing character</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -165,7 +165,7 @@
<object class="GtkLabel" id="label52">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Preview</property>
+ <property name="label" translatable="yes"><b>Preview</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui
index a66d73f..d79cad0 100644
--- a/cui/uiconfig/ui/zoomdialog.ui
+++ b/cui/uiconfig/ui/zoomdialog.ui
@@ -29,6 +29,7 @@
<property name="can_focus">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -44,6 +45,7 @@
<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>
@@ -59,6 +61,7 @@
<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>
@@ -103,6 +106,7 @@
<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>
@@ -120,6 +124,7 @@
<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>
@@ -138,6 +143,7 @@
<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>
@@ -156,6 +162,7 @@
<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>
@@ -178,6 +185,7 @@
<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>
@@ -216,7 +224,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Zoom factor</property>
+ <property name="label" translatable="yes"><b>Zoom factor</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -250,6 +258,7 @@
<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>
@@ -267,6 +276,7 @@
<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>
@@ -289,6 +299,7 @@
<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>
@@ -332,6 +343,7 @@
<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>
@@ -351,7 +363,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">View layout</property>
+ <property name="label" translatable="yes"><b>View layout</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sc/uiconfig/scalc/ui/printeroptions.ui b/sc/uiconfig/scalc/ui/printeroptions.ui
index e65686f..6a5a97b 100644
--- a/sc/uiconfig/scalc/ui/printeroptions.ui
+++ b/sc/uiconfig/scalc/ui/printeroptions.ui
@@ -36,7 +36,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Pages</property>
+ <property name="label" translatable="yes"><b>Pages</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sd/uiconfig/sdraw/ui/printeroptions.ui b/sd/uiconfig/sdraw/ui/printeroptions.ui
index 3718af3..dcdc896 100644
--- a/sd/uiconfig/sdraw/ui/printeroptions.ui
+++ b/sd/uiconfig/sdraw/ui/printeroptions.ui
@@ -65,7 +65,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Contents</property>
+ <property name="label" translatable="yes"><b>Contents</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -157,7 +157,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Color</property>
+ <property name="label" translatable="yes"><b>Color</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -268,7 +268,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Size</property>
+ <property name="label" translatable="yes"><b>Size</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sd/uiconfig/simpress/ui/printeroptions.ui b/sd/uiconfig/simpress/ui/printeroptions.ui
index 99117c5..78aa5e5 100644
--- a/sd/uiconfig/simpress/ui/printeroptions.ui
+++ b/sd/uiconfig/simpress/ui/printeroptions.ui
@@ -82,7 +82,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Contents</property>
+ <property name="label" translatable="yes"><b>Contents</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -174,7 +174,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Color</property>
+ <property name="label" translatable="yes"><b>Color</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -285,7 +285,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Size</property>
+ <property name="label" translatable="yes"><b>Size<b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui
index 9316316..3f48b6a 100644
--- a/sfx2/uiconfig/ui/password.ui
+++ b/sfx2/uiconfig/ui/password.ui
@@ -191,7 +191,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Password</property>
+ <property name="label" translatable="yes"><b>Password</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -287,7 +287,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Second Password</property>
+ <property name="label" translatable="yes"><b>Second Password</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/starmath/uiconfig/smath/ui/printeroptions.ui b/starmath/uiconfig/smath/ui/printeroptions.ui
index 9d81826..ec08385 100644
--- a/starmath/uiconfig/smath/ui/printeroptions.ui
+++ b/starmath/uiconfig/smath/ui/printeroptions.ui
@@ -82,7 +82,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Contents</property>
+ <property name="label" translatable="yes"><b>Contents</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -195,7 +195,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Soze</property>
+ <property name="label" translatable="yes"><b>Size</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/svtools/uiconfig/ui/graphicexport.ui b/svtools/uiconfig/ui/graphicexport.ui
index c0da519..edf64be 100644
--- a/svtools/uiconfig/ui/graphicexport.ui
+++ b/svtools/uiconfig/ui/graphicexport.ui
@@ -239,7 +239,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Size</property>
+ <property name="label" translatable="yes"><b>Size</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -272,7 +272,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Color Depth</property>
+ <property name="label" translatable="yes"><b>Color Depth</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -365,7 +365,7 @@
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Quality</property>
+ <property name="label" translatable="yes"><b>Quality</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -458,7 +458,7 @@
<object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Compression</property>
+ <property name="label" translatable="yes"><b>Compression</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -498,7 +498,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Compression</property>
+ <property name="label" translatable="yes"><b>Compression</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -538,7 +538,7 @@
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Mode</property>
+ <property name="label" translatable="yes"><b>Mode</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -578,7 +578,7 @@
<object class="GtkLabel" id="labe">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Drawing Objects</property>
+ <property name="label" translatable="yes"><b>Drawing Objects</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -650,7 +650,7 @@
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Encoding</property>
+ <property name="label" translatable="yes"><b>Encoding</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -724,7 +724,7 @@
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Preview</property>
+ <property name="label" translatable="yes"><b>Preview</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -798,7 +798,7 @@
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Color format</property>
+ <property name="label" translatable="yes"><b>Color format</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -872,7 +872,7 @@
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Version</property>
+ <property name="label" translatable="yes"><b>Version</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -946,7 +946,7 @@
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Compression</property>
+ <property name="label" translatable="yes"><b>Compression</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -991,7 +991,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Information</property>
+ <property name="label" translatable="yes"><b>Information</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/sw/ui/20872.ui b/sw/uiconfig/sw/ui/20872.ui
index 8e4d764..ceee7d5 100644
--- a/sw/uiconfig/sw/ui/20872.ui
+++ b/sw/uiconfig/sw/ui/20872.ui
@@ -79,7 +79,7 @@
<object class="GtkLabel" id="1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Level</property>
+ <property name="label" translatable="yes"><b>Level</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -430,7 +430,7 @@
<object class="GtkLabel" id="3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Position and spacing</property>
+ <property name="label" translatable="yes"><b>Position and spacing</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/sw/ui/20876.ui b/sw/uiconfig/sw/ui/20876.ui
index 3959035..82c1e9e 100644
--- a/sw/uiconfig/sw/ui/20876.ui
+++ b/sw/uiconfig/sw/ui/20876.ui
@@ -34,7 +34,7 @@
<object class="GtkLabel" id="130">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Level</property>
+ <property name="label" translatable="yes"><b>Level</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -75,8 +75,8 @@
<object class="GtkLabel" id="20">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="hexpand">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Paragraph Style</property>
</object>
<packing>
@@ -326,7 +326,7 @@
<object class="GtkLabel" id="30">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering</property>
+ <property name="label" translatable="yes"><b>Numbering</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui
index b18238b..f51c56d 100644
--- a/sw/uiconfig/swriter/ui/autoformattable.ui
+++ b/sw/uiconfig/swriter/ui/autoformattable.ui
@@ -184,7 +184,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes"><b>Format</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -313,7 +313,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Formatting</property>
+ <property name="label" translatable="yes"><b>Formatting</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/charurlpage.ui b/sw/uiconfig/swriter/ui/charurlpage.ui
index 794212a..4fdeb65 100644
--- a/sw/uiconfig/swriter/ui/charurlpage.ui
+++ b/sw/uiconfig/swriter/ui/charurlpage.ui
@@ -155,21 +155,6 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkComboBoxText" id="targetfrmlb">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -189,6 +174,21 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -197,7 +197,7 @@
<object class="GtkLabel" id="label32">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Hyperlink</property>
+ <property name="label" translatable="yes"><b>Hyperlink</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -284,7 +284,7 @@
<object class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Character styles</property>
+ <property name="label" translatable="yes"><b>Character styles</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/columnwidth.ui b/sw/uiconfig/swriter/ui/columnwidth.ui
index f5e9320..e506ddf 100644
--- a/sw/uiconfig/swriter/ui/columnwidth.ui
+++ b/sw/uiconfig/swriter/ui/columnwidth.ui
@@ -162,7 +162,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Width</property>
+ <property name="label" translatable="yes"><b>Width</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui
index 1d310ba..247379a 100644
--- a/sw/uiconfig/swriter/ui/converttexttable.ui
+++ b/sw/uiconfig/swriter/ui/converttexttable.ui
@@ -231,7 +231,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Separate text at</property>
+ <property name="label" translatable="yes"><b>Separate text at</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -415,7 +415,7 @@
<object class="GtkLabel" id="2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes"><b>Options</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui
index 867e86a..4a49ca5 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -239,7 +239,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Type</property>
+ <property name="label" translatable="yes"><b>Type</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui
index b1266df..181935a 100644
--- a/sw/uiconfig/swriter/ui/linenumbering.ui
+++ b/sw/uiconfig/swriter/ui/linenumbering.ui
@@ -301,7 +301,7 @@
<object class="GtkLabel" id="view">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">View</property>
+ <property name="label" translatable="yes"><b>View</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -412,7 +412,7 @@
<object class="GtkLabel" id="separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Separator</property>
+ <property name="label" translatable="yes"><b>Separator</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -501,7 +501,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="ypad">1</property>
- <property name="label" translatable="yes">Count</property>
+ <property name="label" translatable="yes"><b>Count</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -548,12 +548,6 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="lineadjustment">
- <property name="upper">1000</property>
- <property name="value">3</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkListStore" id="positionstore">
<columns>
<!-- column-name positions -->
@@ -574,6 +568,12 @@
</row>
</data>
</object>
+ <object class="GtkAdjustment" id="lineadjustment">
+ <property name="upper">1000</property>
+ <property name="value">3</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkAdjustment" id="spacingadjustment">
<property name="upper">9999</property>
<property name="value">0.5</property>
diff --git a/sw/uiconfig/swriter/ui/printeroptions.ui b/sw/uiconfig/swriter/ui/printeroptions.ui
index 8025155..ea221cc 100644
--- a/sw/uiconfig/swriter/ui/printeroptions.ui
+++ b/sw/uiconfig/swriter/ui/printeroptions.ui
@@ -116,7 +116,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Contents</property>
+ <property name="label" translatable="yes"><b>Contents</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -156,7 +156,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Color</property>
+ <property name="label" translatable="yes"><b>Color</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -196,7 +196,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Pages</property>
+ <property name="label" translatable="yes"><b>Pages</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui
index 4018d1e..58bcae3 100644
--- a/sw/uiconfig/swriter/ui/sortdialog.ui
+++ b/sw/uiconfig/swriter/ui/sortdialog.ui
@@ -457,7 +457,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.56000000238418579</property>
- <property name="label" translatable="yes">Sort criteria</property>
+ <property name="label" translatable="yes"><b>Sort criteria</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -538,7 +538,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Direction</property>
+ <property name="label" translatable="yes"><b>Direction</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -660,7 +660,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Separator</property>
+ <property name="label" translatable="yes"><b>Separator</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -708,7 +708,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Language</property>
+ <property name="label" translatable="yes"><b>Language</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -749,7 +749,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Setting</property>
+ <property name="label" translatable="yes"><b>Setting</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/splittable.ui b/sw/uiconfig/swriter/ui/splittable.ui
index a17c0b3..2cb23b8 100644
--- a/sw/uiconfig/swriter/ui/splittable.ui
+++ b/sw/uiconfig/swriter/ui/splittable.ui
@@ -176,7 +176,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Mode</property>
+ <property name="label" translatable="yes"><b>Mode</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/stringinput.ui b/sw/uiconfig/swriter/ui/stringinput.ui
index c17202b..d2212dd 100644
--- a/sw/uiconfig/swriter/ui/stringinput.ui
+++ b/sw/uiconfig/swriter/ui/stringinput.ui
@@ -71,7 +71,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Name</property>
+ <property name="label" translatable="yes"><b>Name</b></property>
+ <property name="use_markup">True</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 8715979..43180a1 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -268,7 +268,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Make Title Pages</property>
+ <property name="label" translatable="yes"><b>Make Title Pages</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -414,7 +414,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page Numbering</property>
+ <property name="label" translatable="yes"><b>Page Numbering</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -474,7 +474,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Edit Page Properties</property>
+ <property name="label" translatable="yes"><b>Edit Page Properties</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/wordcount.ui b/sw/uiconfig/swriter/ui/wordcount.ui
index b91dae2..04b9efa 100644
--- a/sw/uiconfig/swriter/ui/wordcount.ui
+++ b/sw/uiconfig/swriter/ui/wordcount.ui
@@ -187,7 +187,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Current selection</property>
+ <property name="label" translatable="yes"><b>Current selection</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -322,7 +322,7 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Whole document</property>
+ <property name="label" translatable="yes"><b>Whole document</b></property>
<property name="use_markup">True</property>
</object>
</child>
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index a9cb400..507742e 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -372,7 +372,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Printer</property>
+ <property name="label" translatable="yes"><b>Printer</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -712,7 +712,7 @@
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Range and copies</property>
+ <property name="label" translatable="yes"><b>Range and copies</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -769,7 +769,7 @@
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Print</property>
+ <property name="label" translatable="yes"><b>Print</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -897,7 +897,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Print</property>
+ <property name="label" translatable="yes"><b>Print</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -1292,7 +1292,7 @@
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Layout</property>
+ <property name="label" translatable="yes"><b>Layout</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -1350,7 +1350,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page sides</property>
+ <property name="label" translatable="yes"><b>Page sides</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -1453,7 +1453,7 @@
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list