[Libreoffice-commits] core.git: 2 commits - chart2/source chart2/uiconfig sw/source
Caolán McNamara
caolanm at redhat.com
Wed Sep 4 01:58:24 PDT 2013
chart2/source/controller/inc/HelpIds.hrc | 6
chart2/uiconfig/ui/tp_axisLabel.ui | 286 +++++++++++++++----------------
sw/source/core/text/inftxt.hxx | 2
sw/source/core/text/porfld.cxx | 2
sw/source/core/text/porftn.hxx | 18 -
sw/source/core/text/porhyph.hxx | 23 +-
sw/source/core/text/porlay.hxx | 4
sw/source/core/text/txtftn.cxx | 22 +-
sw/source/core/text/txthyph.cxx | 14 -
9 files changed, 183 insertions(+), 194 deletions(-)
New commits:
commit 3e2c8d7c7bd116fe67914d93cb0ea5cb6d5a7c23
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 4 09:57:17 2013 +0100
discard unused HIDs now
Change-Id: Ia2009331a2df849ed5ace0c6c5f7f2b8e53e1555
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index fde7e24..c80fea9 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -44,12 +44,6 @@
#define HID_SCH_TBI_DATA_INSERT_TEXT_COL "CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL"
#define HID_SCH_TBX_DATA "CHART2_HID_SCH_TBX_DATA"
-#define HID_SCH_ALIGNMENT_CTR_DIAL "CHART2_HID_SCH_ALIGNMENT_CTR_DIAL"
-#define HID_SCH_ALIGNMENT_STACKED "CHART2_HID_SCH_ALIGNMENT_STACKED"
-#define HID_SCH_ALIGNMENT_DEGREES "CHART2_HID_SCH_ALIGNMENT_DEGREES"
-
-#define HID_SCH_TP_AXIS_LABEL "CHART2_HID_SCH_TP_AXIS_LABEL"
-
#define HID_SCH_CHART_AUTO_FORMAT "CHART2_HID_SCH_CHART_AUTO_FORMAT"
#define HID_SCH_LB_BAR_GEOMETRY "CHART2_HID_SCH_LB_BAR_GEOMETRY"
#define HID_SCH_DLG_RANGES "CHART2_HID_SCH_DLG_RANGES"
diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui
index 2f63f76..6165003 100644
--- a/chart2/uiconfig/ui/tp_axisLabel.ui
+++ b/chart2/uiconfig/ui/tp_axisLabel.ui
@@ -1,13 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkAdjustment" id="adjustmentSpinDegrees">
+ <property name="upper">359</property>
+ <property name="step_increment">5</property>
+ </object>
<object class="GtkBox" id="AxisLabelTabPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkCheckButton" id="showlabelsCB">
@@ -15,7 +20,6 @@
<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="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -31,6 +35,8 @@
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">18</property>
+ <property name="homogeneous">True</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -41,22 +47,22 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="tile">
<property name="label" translatable="yes">_Tile</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="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -75,7 +81,6 @@
<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="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -93,7 +98,6 @@
<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="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -111,7 +115,6 @@
<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="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -154,22 +157,22 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="overlapCB">
<property name="label" translatable="yes">O_verlap</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="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -186,7 +189,6 @@
<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="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -197,12 +199,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -232,185 +228,185 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="TitleRotationTabPage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="border_width">6</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkFrame" id="TitleRotationTabPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="hexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkGrid" id="grid10">
+ <object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid3">
+ <object class="GtkGrid" id="grid10">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="svxlo-WrapField" id="OrientDegree">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="margin_top">40</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- <property name="progress_pulse_step">1</property>
- <property name="adjustment">adjustmentSpinDegrees</property>
- <property name="wrap">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="svxlo-WrapField" id="OrientDegree">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin_top">40</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="progress_pulse_step">1</property>
+ <property name="adjustment">adjustmentSpinDegrees</property>
+ <property name="wrap">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="GtkLabel" id="degreeL">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">40</property>
+ <property name="label" translatable="yes">_Degrees</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <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="GtkLabel" id="degreeL">
+ <object class="svxlo-DialControl" id="dialCtrl">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">40</property>
- <property name="label" translatable="yes">_Degrees</property>
- <property name="use_underline">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="active">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <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>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="stackedCB">
+ <property name="label" translatable="yes">Ve_rtically stacked</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.019999999552965164</property>
+ <property name="inconsistent">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="GtkLabel" id="labelABCD">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">ABCD</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>
+ <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="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="svxlo-DialControl" id="dialCtrl">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="active">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="GtkGrid" id="grid4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
<child>
- <object class="GtkCheckButton" id="stackedCB">
- <property name="label" translatable="yes">Ve_rtically stacked</property>
+ <object class="GtkLabel" id="textdirL">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Te_xt direction:</property>
<property name="use_underline">True</property>
- <property name="xalign">0.019999999552965164</property>
- <property name="inconsistent">True</property>
- <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="labelABCD">
+ <object class="chartcontrollerlo-TextDirectionListBox" id="textdirLB">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">ABCD</property>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</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>
- <child>
- <object class="GtkLabel" id="textdirL">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Te_xt direction:</property>
- <property name="use_underline">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="chartcontrollerlo-TextDirectionListBox" id="textdirLB">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
</child>
</object>
</child>
+ <child type="label">
+ <object class="GtkLabel" id="labelTextOrient">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Text orientation</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="labelTextOrient">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Text orientation</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
@@ -418,8 +414,4 @@
</packing>
</child>
</object>
-<object class="GtkAdjustment" id="adjustmentSpinDegrees">
- <property name="upper">359</property>
- <property name="step_increment">5</property>
- </object>
</interface>
commit dd18372f7e4d9d6e5bd571394123a3de3d40cb94
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 4 09:19:23 2013 +0100
XubString->OUString
Change-Id: I9ce007261555008a438b90b36a888a8d4cb4f140
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index f9963d5..544f56f 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -700,7 +700,7 @@ public:
// Calls HyphenateWord() of Hyphenator
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord >
- HyphWord( const String &rTxt, const sal_uInt16 nMinTrail );
+ HyphWord( const OUString &rTxt, const sal_uInt16 nMinTrail );
const com::sun::star::beans::PropertyValues &
GetHyphValues() const;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 09f75bd..c6e49c6 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -372,7 +372,7 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
sal_Int32 nNextOfst = aExpand.getLength() - nRest;
if ( IsQuoVadisPortion() )
- nNextOfst = nNextOfst + ((SwQuoVadisPortion*)this)->GetContTxt().Len();
+ nNextOfst = nNextOfst + ((SwQuoVadisPortion*)this)->GetContTxt().getLength();
XubString aNew( aExpand, nNextOfst, STRING_LEN );
aExpand = aExpand.copy( 0, nNextOfst );
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index f45a8b0..a3c80c2 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -36,9 +36,9 @@ class SwFtnPortion : public SwFldPortion
bool mbPreferredScriptTypeSet;
sal_uInt8 mnPreferredScriptType;
public:
- SwFtnPortion( const XubString &rExpand, SwTxtFtn *pFtn,
+ SwFtnPortion( const OUString &rExpand, SwTxtFtn *pFtn,
KSHORT nOrig = KSHRT_MAX );
- inline KSHORT& Orig() { return nOrigHeight; }
+ KSHORT& Orig() { return nOrigHeight; }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
@@ -59,7 +59,7 @@ public:
class SwFtnNumPortion : public SwNumberPortion
{
public:
- inline SwFtnNumPortion( const XubString &rExpand, SwFont *pFntL )
+ SwFtnNumPortion( const OUString &rExpand, SwFont *pFntL )
: SwNumberPortion( rExpand, pFntL, sal_True, sal_False, 0, false )
{ SetWhichPor( POR_FTNNUM ); }
@@ -72,16 +72,16 @@ public:
class SwQuoVadisPortion : public SwFldPortion
{
- XubString aErgo;
+ OUString aErgo;
public:
- SwQuoVadisPortion( const XubString &rExp, const XubString& rStr );
+ SwQuoVadisPortion( const OUString &rExp, const OUString& rStr );
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- inline void SetNumber( const XubString& rStr ) { aErgo = rStr; }
- inline const OUString GetQuoTxt() const { return aExpand; }
- inline const XubString &GetContTxt() const { return aErgo; }
+ void SetNumber( const OUString& rStr ) { aErgo = rStr; }
+ const OUString GetQuoTxt() const { return aExpand; }
+ const OUString &GetContTxt() const { return aErgo; }
// Field cloner for SplitGlue
virtual SwFldPortion *Clone( const OUString &rExpand ) const;
@@ -99,7 +99,7 @@ public:
class SwErgoSumPortion : public SwFldPortion
{
public:
- SwErgoSumPortion( const XubString &rExp, const XubString& rStr );
+ SwErgoSumPortion( const OUString &rExp, const OUString& rStr );
virtual xub_StrLen GetCrsrOfst( const KSHORT nOfst ) const;
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 8e68bc3..9da5395 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -28,7 +28,10 @@
class SwHyphPortion : public SwExpandPortion
{
public:
- inline SwHyphPortion( ) { SetWhichPor( POR_HYPH ); }
+ SwHyphPortion()
+ {
+ SetWhichPor( POR_HYPH );
+ }
virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
@@ -44,9 +47,14 @@ public:
class SwHyphStrPortion : public SwHyphPortion
{
- XubString aExpand;
+ OUString aExpand;
public:
- inline SwHyphStrPortion( const XubString &rStr );
+ SwHyphStrPortion(const OUString &rStr)
+ : aExpand(rStr + "-")
+ {
+ SetWhichPor( POR_HYPHSTR );
+ }
+
virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
// Accessibility: pass information about this portion to the PortionHandler
@@ -90,18 +98,11 @@ public:
class SwSoftHyphStrPortion : public SwHyphStrPortion
{
public:
- SwSoftHyphStrPortion( const XubString &rStr );
+ SwSoftHyphStrPortion( const OUString &rStr );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
OUTPUT_OPERATOR
};
-inline SwHyphStrPortion::SwHyphStrPortion( const XubString &rStr )
- : aExpand( rStr )
-{
- aExpand += '-';
- SetWhichPor( POR_HYPHSTR );
-}
-
CLASSIO( SwHyphPortion )
CLASSIO( SwHyphStrPortion )
CLASSIO( SwSoftHyphPortion )
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 83ac09b..1d6e252 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -305,7 +305,7 @@ public:
xub_StrLen GetParLen() const;
// For Prepare()
- sal_Bool UpdateQuoVadis( const XubString &rQuo );
+ sal_Bool UpdateQuoVadis( const OUString &rQuo );
// Flags
inline void SetFly( const sal_Bool bNew = sal_True ) { bFlys = bNew; }
@@ -349,7 +349,7 @@ public:
SvStream &WriteSwg( SvStream& rStream ); //$ ostream
// Set nErgo in the QuoVadisPortion
- void SetErgoSumNum( const XubString &rErgo );
+ void SetErgoSumNum( const OUString &rErgo );
const SwDropPortion *FindDropPortion() const;
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 7293b43..4bfe9d2 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -999,7 +999,7 @@ SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const
SwFmtFtn& rFtn = (SwFmtFtn&)pFtn->GetFtn();
SwDoc *pDoc = pFrm->GetNode()->GetDoc();
- XubString aFtnTxt( rFtn.GetViewNumStr( *pDoc, sal_True ));
+ OUString aFtnTxt( rFtn.GetViewNumStr( *pDoc, sal_True ));
const SwEndNoteInfo* pInfo;
if( rFtn.IsEndNote() )
@@ -1039,7 +1039,7 @@ SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const
* SwTxtFormatter::NewErgoSumPortion()
*************************************************************************/
-XubString lcl_GetPageNumber( const SwPageFrm* pPage )
+OUString lcl_GetPageNumber( const SwPageFrm* pPage )
{
OSL_ENSURE( pPage, "GetPageNumber: Homeless TxtFrm" );
MSHORT nVirtNum = pPage->GetVirtPageNum();
@@ -1065,7 +1065,7 @@ SwErgoSumPortion *SwTxtFormatter::NewErgoSumPortion( SwTxtFormatInfo &rInf ) con
const SwPageFrm* pQuoPage = pQuoFrm->FindPageFrm();
if( pPage == pQuoFrm->FindPageFrm() )
return 0; // Wenn der QuoVadis auf der selben (spaltigen) Seite steht
- const XubString aPage = lcl_GetPageNumber( pPage );
+ const OUString aPage = lcl_GetPageNumber( pPage );
SwParaPortion *pPara = pQuoFrm->GetPara();
if( pPara )
pPara->SetErgoSumNum( aPage );
@@ -1142,7 +1142,7 @@ xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset )
const KSHORT nOldRealWidth = rInf.RealWidth();
rInf.RealWidth( nOldRealWidth - nLastLeft );
- XubString aErgo = lcl_GetPageNumber( pErgoFrm->FindPageFrm() );
+ OUString aErgo = lcl_GetPageNumber( pErgoFrm->FindPageFrm() );
SwQuoVadisPortion *pQuo = new SwQuoVadisPortion(rFtnInfo.aQuoVadis, aErgo );
pQuo->SetAscent( rInf.GetAscent() );
pQuo->Height( rInf.GetTxtHeight() );
@@ -1401,7 +1401,7 @@ SwFtnSave::~SwFtnSave()
* SwFtnPortion::SwFtnPortion()
*************************************************************************/
-SwFtnPortion::SwFtnPortion( const XubString &rExpand,
+SwFtnPortion::SwFtnPortion( const OUString &rExpand,
SwTxtFtn *pFootn, KSHORT nReal )
: SwFldPortion( rExpand, 0 )
, pFtn(pFootn)
@@ -1484,9 +1484,11 @@ void SwFtnPortion::SetPreferredScriptType( sal_uInt8 nPreferredScriptType )
*************************************************************************/
SwFldPortion *SwQuoVadisPortion::Clone( const OUString &rExpand ) const
-{ return new SwQuoVadisPortion( rExpand, aErgo ); }
+{
+ return new SwQuoVadisPortion( rExpand, aErgo );
+}
-SwQuoVadisPortion::SwQuoVadisPortion( const XubString &rExp, const XubString& rStr )
+SwQuoVadisPortion::SwQuoVadisPortion( const OUString &rExp, const OUString& rStr )
: SwFldPortion( rExp ), aErgo(rStr)
{
SetLen(0);
@@ -1575,7 +1577,7 @@ SwFldPortion *SwErgoSumPortion::Clone( const OUString &rExpand ) const
return new SwErgoSumPortion( rExpand, OUString() );
}
-SwErgoSumPortion::SwErgoSumPortion( const XubString &rExp, const XubString& rStr )
+SwErgoSumPortion::SwErgoSumPortion(const OUString &rExp, const OUString& rStr)
: SwFldPortion( rExp )
{
SetLen(0);
@@ -1618,7 +1620,7 @@ sal_Bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
* SwParaPortion::SetErgoSumNum()
*************************************************************************/
-void SwParaPortion::SetErgoSumNum( const XubString& rErgo )
+void SwParaPortion::SetErgoSumNum( const OUString& rErgo )
{
SwLineLayout *pLay = this;
while( pLay->GetNext() )
@@ -1643,7 +1645,7 @@ void SwParaPortion::SetErgoSumNum( const XubString& rErgo )
* Wird im SwTxtFrm::Prepare() gerufen
*************************************************************************/
-sal_Bool SwParaPortion::UpdateQuoVadis( const XubString &rQuo )
+sal_Bool SwParaPortion::UpdateQuoVadis( const OUString &rQuo )
{
SwLineLayout *pLay = this;
while( pLay->GetNext() )
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 62b3ad4..a234dcf 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -41,9 +41,9 @@ using namespace ::com::sun::star::i18n;
*************************************************************************/
Reference< XHyphenatedWord > SwTxtFormatInfo::HyphWord(
- const XubString &rTxt, const MSHORT nMinTrail )
+ const OUString &rTxt, const MSHORT nMinTrail )
{
- if( rTxt.Len() < 4 || m_pFnt->IsSymbol(m_pVsh) )
+ if( rTxt.getLength() < 4 || m_pFnt->IsSymbol(m_pVsh) )
return 0;
Reference< XHyphenator > xHyph = ::GetHyphenator();
Reference< XHyphenatedWord > xHyphWord;
@@ -51,7 +51,7 @@ Reference< XHyphenatedWord > SwTxtFormatInfo::HyphWord(
if( xHyph.is() )
xHyphWord = xHyph->hyphenate( OUString(rTxt),
g_pBreakIt->GetLocale( m_pFnt->GetLanguage() ),
- rTxt.Len() - nMinTrail, GetHyphValues() );
+ rTxt.getLength() - nMinTrail, GetHyphValues() );
return xHyphWord;
}
@@ -237,7 +237,7 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
bRet = 0 != nLen;
if( bRet )
{
- XubString aSelTxt( rInf.GetTxt().copy(nWrdStart, nLen) );
+ OUString aSelTxt( rInf.GetTxt().copy(nWrdStart, nLen) );
{
MSHORT nMinTrail = 0;
@@ -293,7 +293,7 @@ sal_Bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
aAltSpell = SvxGetAltSpelling( xHyphWord );
OSL_ENSURE( aAltSpell.bIsAltSpelling, "no alternatve spelling" );
- XubString aAltTxt = aAltSpell.aReplacement;
+ OUString aAltTxt = aAltSpell.aReplacement;
nPorEnd = aAltSpell.nChangedPos + rGuess.BreakStart() - rGuess.FieldDiff();
xub_StrLen nTmpLen = 0;
@@ -308,7 +308,7 @@ sal_Bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
}
// length of pHyphPor is adjusted
- pHyphPor->SetLen( aAltTxt.Len() + 1 );
+ pHyphPor->SetLen( aAltTxt.getLength() + 1 );
(SwPosSize&)(*pHyphPor) = pHyphPor->GetTxtSize( rInf );
pHyphPor->SetLen( aAltSpell.nChangedLength + nTmpLen );
}
@@ -635,7 +635,7 @@ void SwSoftHyphStrPortion::Paint( const SwTxtPaintInfo &rInf ) const
SwHyphStrPortion::Paint( rInf );
}
-SwSoftHyphStrPortion::SwSoftHyphStrPortion( const XubString &rStr )
+SwSoftHyphStrPortion::SwSoftHyphStrPortion( const OUString &rStr )
: SwHyphStrPortion( rStr )
{
SetLen( 1 );
More information about the Libreoffice-commits
mailing list