[Libreoffice-commits] .: 2 commits - basctl/source cui/source dbaccess/source helpcontent2 svtools/inc svtools/source svx/inc svx/source svx/workben sw/source vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 25 04:04:51 PDT 2012
basctl/source/basicide/moduldl2.cxx | 5 +-
basctl/source/basicide/moduldlg.hxx | 2 -
cui/source/customize/acccfg.cxx | 12 +++---
cui/source/inc/acccfg.hxx | 3 +
cui/source/options/optHeaderTabListbox.cxx | 2 -
cui/source/options/optHeaderTabListbox.hxx | 2 -
dbaccess/source/ui/control/dbtreelistbox.cxx | 2 -
dbaccess/source/ui/control/tabletree.cxx | 2 -
dbaccess/source/ui/inc/WNameMatch.hxx | 2 -
dbaccess/source/ui/inc/dbtreelistbox.hxx | 2 -
dbaccess/source/ui/inc/tabletree.hxx | 2 -
dbaccess/source/ui/misc/WNameMatch.cxx | 4 +-
helpcontent2 | 2 -
svtools/inc/svtools/svtabbx.hxx | 2 -
svtools/inc/svtools/treelistbox.hxx | 2 -
svtools/source/contnr/svtabbx.cxx | 6 +--
svtools/source/contnr/treelistbox.cxx | 6 +--
svx/inc/svx/ctredlin.hxx | 2 -
svx/inc/svx/fontlb.hxx | 4 +-
svx/source/dialog/ctredlin.cxx | 4 +-
svx/source/dialog/docrecovery.cxx | 38 ++++++++++----------
svx/source/dialog/fontlb.cxx | 4 +-
svx/source/form/filtnav.cxx | 4 +-
svx/source/inc/docrecovery.hxx | 20 +++++-----
svx/source/inc/filtnav.hxx | 2 -
svx/workben/msview/msview.cxx | 5 +-
sw/source/ui/inc/conttree.hxx | 4 +-
sw/source/ui/utlui/content.cxx | 2 -
sw/source/ui/utlui/glbltree.cxx | 2 -
vcl/source/window/builder.cxx | 8 ----
vcl/source/window/window2.cxx | 50 +++++++++++++++++++--------
31 files changed, 113 insertions(+), 94 deletions(-)
New commits:
commit 7b45dfe09772a216df4953c580302569c1835f73
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 25 12:04:13 2012 +0100
convert Mnemonic markup automatically
Change-Id: I55b6bf11468ce958aea7c98894d3a76343b53a9a
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 51e6fcb..8c330d0 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1528,13 +1528,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rI
if (!sProperty.isEmpty())
{
sProperty = sProperty.replace('_', '-');
- //replace '_' with '-' except for property values that
- //refer to widget ids themselves. TO-DO, drop conversion
- //and just use foo_bar properties throughout ?
- if (sProperty == "group")
- rMap[sProperty] = sValue;
- else
- rMap[sProperty] = sValue.replace('_', '-');
+ rMap[sProperty] = sValue;
}
}
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index ba04bb6..69d580b 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1284,22 +1284,22 @@ Window* Window::ImplGetTopmostFrameWindow()
return pTopmostParent->mpWindowImpl->mpFrameWindow;
}
-void Window::SetHelpId( const rtl::OString& rHelpId )
+void Window::SetHelpId( const OString& rHelpId )
{
mpWindowImpl->maHelpId = rHelpId;
}
-const rtl::OString& Window::GetHelpId() const
+const OString& Window::GetHelpId() const
{
return mpWindowImpl->maHelpId;
}
-void Window::SetUniqueId( const rtl::OString& rUniqueId )
+void Window::SetUniqueId( const OString& rUniqueId )
{
mpWindowImpl->maUniqId = rUniqueId;
}
-const rtl::OString& Window::GetUniqueId() const
+const OString& Window::GetUniqueId() const
{
return mpWindowImpl->maUniqId;
}
@@ -1938,7 +1938,7 @@ void Window::take_properties(Window &rOther)
namespace
{
- VclAlign toAlign(const rtl::OString &rValue)
+ VclAlign toAlign(const OString &rValue)
{
VclAlign eRet = VCL_ALIGN_FILL;
@@ -1954,12 +1954,36 @@ namespace
}
}
-bool Window::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+namespace
{
- if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("label")))
- SetText(rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("title")))
- SetText(rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
+ OString convertMnemonicMarkup(const OString &rIn)
+ {
+ OStringBuffer aRet(rIn);
+ for (sal_Int32 nI = 0; nI < aRet.getLength(); ++nI)
+ {
+ if (aRet[nI] == '_')
+ {
+ if (aRet[nI+1] != '_')
+ aRet[nI] = '~';
+ else
+ aRet.remove(nI, 1);
+ ++nI;
+ }
+ }
+ return aRet.makeStringAndClear();
+ }
+}
+
+bool Window::set_property(const OString &rKey, const OString &rValue)
+{
+ if (
+ (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("label"))) ||
+ (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("title"))) ||
+ (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("text")))
+ )
+ {
+ SetText(OStringToOUString(convertMnemonicMarkup(rValue), RTL_TEXTENCODING_UTF8));
+ }
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("visible")))
Show(toBool(rValue));
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("sensitive")))
@@ -2010,8 +2034,6 @@ bool Window::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
nBits |= WB_WORDBREAK;
SetStyle(nBits);
}
- else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("text")))
- SetText(rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("height-request")))
set_height_request(rValue.toInt32());
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("width-request")))
@@ -2025,9 +2047,9 @@ bool Window::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("valign")))
set_valign(toAlign(rValue));
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("tooltip-markup")))
- SetQuickHelpText(rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
+ SetQuickHelpText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("tooltip-text")))
- SetQuickHelpText(rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
+ SetQuickHelpText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("border-width")))
set_border_width(rValue.toInt32());
else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("margin-left")))
commit c7bac4da02d51f8180aaad5b3768f4ff5bd80d4d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 25 11:26:43 2012 +0100
XubString->OUString
Change-Id: I5835696a3246b4d8f401a1617d2b53ec8c7c5626
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 2d980fe..05f5c10 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -260,9 +260,10 @@ bool CheckBox::IsChecked( sal_uLong nPos ) const
//----------------------------------------------------------------------------
-void CheckBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind )
+void CheckBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rTxt,
+ const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind )
{
- SvTabListBox::InitEntry( pEntry, rTxt, rImg1, rImg2, eButtonKind );
+ SvTabListBox::InitEntry(pEntry, rTxt, rImg1, rImg2, eButtonKind);
if (eMode == ObjectMode::Module)
{
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 156f0ad..34de345 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -140,7 +140,7 @@ public:
void CheckEntryPos( sal_uLong nPos );
bool IsChecked( sal_uLong nPos ) const;
- virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind);
virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel );
virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 0d6eb9e..a3ac450 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -663,13 +663,13 @@ void SfxAccCfgLBoxString_Impl::Paint(
}
//-----------------------------------------------
-void SfxAccCfgTabListBox_Impl::InitEntry( SvTreeListEntry* pEntry ,
- const XubString& sText ,
- const Image& aImage1,
- const Image& aImage2,
- SvLBoxButtonKind eButtonKind)
+void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry,
+ const OUString& rText,
+ const Image& rImage1,
+ const Image& rImage2,
+ SvLBoxButtonKind eButtonKind)
{
- SvTabListBox::InitEntry(pEntry, sText, aImage1, aImage2, eButtonKind);
+ SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind);
}
//-----------------------------------------------
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index b2309e9..a837b8d 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -61,7 +61,8 @@ class SfxAccCfgTabListBox_Impl : public SvTabListBox
void KeyInput( const KeyEvent &rKEvt );
protected:
- virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&,
+ const Image&, SvLBoxButtonKind eButtonKind);
public:
SfxAccCfgTabListBox_Impl(
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 6149c15..32ba107 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -57,7 +57,7 @@ OptHeaderTabListBox::OptHeaderTabListBox( Window* pParent, WinBits nWinStyle ) :
}
// -----------------------------------------------------------------------
-void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rTxt,
+void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const OUString& rTxt,
const Image& rImg1, const Image& rImg2,
SvLBoxButtonKind eButtonKind )
{
diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx
index 472dcc1..8124a1c 100644
--- a/cui/source/options/optHeaderTabListbox.hxx
+++ b/cui/source/options/optHeaderTabListbox.hxx
@@ -30,7 +30,7 @@ namespace svx
public:
OptHeaderTabListBox( Window* pParent, WinBits nBits );
- virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind );
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
};
} // svx
#endif // SVX_OPTHEADERTABLISTBOX_HXX
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 96b5ce3..c62068e 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -156,7 +156,7 @@ void DBTreeListBox::RequestingChildren( SvTreeListEntry* pParent )
}
// -------------------------------------------------------------------------
-void DBTreeListBox::InitEntry( SvTreeListEntry* _pEntry, const XubString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind)
+void DBTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind)
{
SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp, eButtonKind);
SvLBoxItem* pTextItem(_pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 94b2d32..a2d4115 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -422,7 +422,7 @@ void OTableTreeListBox::implEmphasize(SvTreeListEntry* _pEntry, sal_Bool _bCheck
}
//------------------------------------------------------------------------
-void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind)
+void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind)
{
OMarkableTreeListBox::InitEntry(_pEntry, _rString, _rCollapsedBitmap, _rExpandedBitmap, _eButtonKind);
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index 038b703..0beb955 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -35,7 +35,7 @@ namespace dbaui
{
sal_Bool m_bReadOnly;
protected:
- virtual void InitEntry(SvTreeListEntry* pEntry, const String& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind);
+ virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind);
public:
OColumnTreeBox( Window* pParent, const ResId& rResId );
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index de6e45a..f61c8ad 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -123,7 +123,7 @@ namespace dbaui
virtual void KeyInput( const KeyEvent& rKEvt );
virtual void StateChanged( StateChangedType nStateChange );
- virtual void InitEntry( SvTreeListEntry* pEntry, const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind);
+ virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind);
// enable editing for tables/views and queries
virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& );
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index 50688d9..960f426 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -145,7 +145,7 @@ public:
sal_Bool isWildcardChecked(SvTreeListEntry* _pEntry) const;
protected:
- virtual void InitEntry(SvTreeListEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind);
+ virtual void InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind);
virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry);
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 44d8da7..6a40a71 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -358,9 +358,9 @@ OColumnTreeBox::OColumnTreeBox( Window* pParent, const ResId& rResId )
SetSelectionMode( SINGLE_SELECTION );
}
//------------------------------------------------------------------------
-void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const String& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind)
+void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind)
{
- DBTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
+ DBTreeListBox::InitEntry(pEntry, rStr, rImg1, rImg2, eButtonKind);
SvLBoxString* pString = new OColumnString(pEntry, 0, rStr,sal_False);
if (pString)
pEntry->ReplaceItem( pString, pEntry->ItemCount() - 1 );
diff --git a/helpcontent2 b/helpcontent2
index a5dda49..5bfa031 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a5dda4966fe9f77fb767cf084d7113a4393d69d7
+Subproject commit 5bfa0312c389fab33dde8bc3d196dc51764b12b4
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index a10fb4c..b8d5b07 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -65,7 +65,7 @@ protected:
static const sal_Unicode* GetToken( const sal_Unicode* pPtr, sal_uInt16& rLen );
virtual void SetTabs();
- virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind );
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
String GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const;
SvTreeListEntry* GetEntryOnPos( sal_uLong _nEntryPos ) const;
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 8284260..6cd2162 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -579,7 +579,7 @@ protected:
SvLBoxTab* GetTab( SvTreeListEntry*, SvLBoxItem* ) const;
void ClearTabList();
- virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
virtual void NotifyBeginScroll();
virtual void NotifyEndScroll();
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index d9f0c55..ab3bf5c 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -79,10 +79,10 @@ void SvTabListBox::SetTabs()
}
}
-void SvTabListBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rStr,
- const Image& rColl, const Image& rExp, SvLBoxButtonKind eButtonKind )
+void SvTabListBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr,
+ const Image& rColl, const Image& rExp, SvLBoxButtonKind eButtonKind)
{
- SvTreeListBox::InitEntry( pEntry, rStr, rColl, rExp, eButtonKind );
+ SvTreeListBox::InitEntry(pEntry, rStr, rColl, rExp, eButtonKind);
XubString aToken;
const sal_Unicode* pCurToken = aCurEntry.GetBuffer();
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 2806d30..9b773e5 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1750,9 +1750,9 @@ void SvTreeListBox::SetTabs()
pImp->NotifyTabsChanged();
}
-void SvTreeListBox::InitEntry( SvTreeListEntry* pEntry,
- const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp,
- SvLBoxButtonKind eButtonKind)
+void SvTreeListBox::InitEntry(SvTreeListEntry* pEntry,
+ const OUString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp,
+ SvLBoxButtonKind eButtonKind)
{
DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxButton* pButton;
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 2d7563b..2eabe08 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -116,7 +116,7 @@ private:
protected:
virtual StringCompare ColCompare(SvTreeListEntry*,SvTreeListEntry*);
- virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index 422e99c..5781e3a 100644
--- a/svx/inc/svx/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
@@ -104,10 +104,10 @@ protected:
@descr Uses current value of maEntryFont to set the entry font (if mbUseFont is true). */
virtual void InitEntry(
SvTreeListEntry* pEntry,
- const XubString& rEntryText,
+ const OUString& rEntryText,
const Image& rCollImg,
const Image& rExpImg,
- SvLBoxButtonKind eButtonKind );
+ SvLBoxButtonKind eButtonKind);
};
// ============================================================================
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index aad70d4..0b106cc 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -440,8 +440,8 @@ SvTreeListEntry* SvxRedlinTable::CreateEntry() const
return new SvxRedlinEntry;
}
-void SvxRedlinTable::InitEntry( SvTreeListEntry* pEntry, const XubString& rStr,
- const Image& rColl, const Image& rExp, SvLBoxButtonKind eButtonKind )
+void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr,
+ const Image& rColl, const Image& rExp, SvLBoxButtonKind eButtonKind)
{
SvLBoxButton* pButton;
SvLBoxString* pString;
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index cde54e5..553a4af 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -211,9 +211,9 @@ sal_Bool RecoveryCore::isBrokenTempEntry(const TURLInfo& rInfo)
}
//===============================================
-void RecoveryCore::saveBrokenTempEntries(const ::rtl::OUString& sPath)
+void RecoveryCore::saveBrokenTempEntries(const OUString& rPath)
{
- if (sPath.isEmpty())
+ if (rPath.isEmpty())
return;
if (!m_xRealCore.is())
@@ -225,7 +225,7 @@ void RecoveryCore::saveBrokenTempEntries(const ::rtl::OUString& sPath)
lCopyArgs[0].Name = PROP_DISPATCHASYNCHRON;
lCopyArgs[0].Value <<= sal_False;
lCopyArgs[1].Name = PROP_SAVEPATH;
- lCopyArgs[1].Value <<= sPath;
+ lCopyArgs[1].Value <<= rPath;
lCopyArgs[2].Name = PROP_ENTRYID;
// lCopyArgs[2].Value will be changed during next loop ...
@@ -249,9 +249,9 @@ void RecoveryCore::saveBrokenTempEntries(const ::rtl::OUString& sPath)
}
//===============================================
-void RecoveryCore::saveAllTempEntries(const ::rtl::OUString& sPath)
+void RecoveryCore::saveAllTempEntries(const OUString& rPath)
{
- if (sPath.isEmpty())
+ if (rPath.isEmpty())
return;
if (!m_xRealCore.is())
@@ -263,7 +263,7 @@ void RecoveryCore::saveAllTempEntries(const ::rtl::OUString& sPath)
lCopyArgs[0].Name = PROP_DISPATCHASYNCHRON;
lCopyArgs[0].Value <<= sal_False;
lCopyArgs[1].Name = PROP_SAVEPATH;
- lCopyArgs[1].Value <<= sPath;
+ lCopyArgs[1].Value <<= rPath;
lCopyArgs[2].Name = PROP_ENTRYID;
// lCopyArgs[2].Value will be changed during next loop ...
@@ -506,12 +506,12 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
aNew.ID = lInfo.getUnpackedValueOrDefault(STATEPROP_ID , (sal_Int32)0 );
aNew.DocState = lInfo.getUnpackedValueOrDefault(STATEPROP_STATE , (sal_Int32)0 );
- aNew.OrgURL = lInfo.getUnpackedValueOrDefault(STATEPROP_ORGURL , ::rtl::OUString());
- aNew.TempURL = lInfo.getUnpackedValueOrDefault(STATEPROP_TEMPURL , ::rtl::OUString());
- aNew.FactoryURL = lInfo.getUnpackedValueOrDefault(STATEPROP_FACTORYURL , ::rtl::OUString());
- aNew.TemplateURL = lInfo.getUnpackedValueOrDefault(STATEPROP_TEMPLATEURL, ::rtl::OUString());
- aNew.DisplayName = lInfo.getUnpackedValueOrDefault(STATEPROP_TITLE , ::rtl::OUString());
- aNew.Module = lInfo.getUnpackedValueOrDefault(STATEPROP_MODULE , ::rtl::OUString());
+ aNew.OrgURL = lInfo.getUnpackedValueOrDefault(STATEPROP_ORGURL , OUString());
+ aNew.TempURL = lInfo.getUnpackedValueOrDefault(STATEPROP_TEMPURL , OUString());
+ aNew.FactoryURL = lInfo.getUnpackedValueOrDefault(STATEPROP_FACTORYURL , OUString());
+ aNew.TemplateURL = lInfo.getUnpackedValueOrDefault(STATEPROP_TEMPLATEURL, OUString());
+ aNew.DisplayName = lInfo.getUnpackedValueOrDefault(STATEPROP_TITLE , OUString());
+ aNew.Module = lInfo.getUnpackedValueOrDefault(STATEPROP_MODULE , OUString());
// search for already existing items and update her nState value ...
TURLList::iterator pIt;
@@ -897,7 +897,7 @@ void RecovDocListEntry::Paint(const Point& aPos ,
SvTreeListEntry* pEntry )
{
const Image* pImg = 0;
- const String* pTxt = 0;
+ const OUString* pTxt = 0;
RecovDocList* pList = static_cast< RecovDocList* >(&aDevice);
TURLInfo* pInfo = (TURLInfo*)pEntry->GetUserData();
@@ -970,13 +970,13 @@ RecovDocList::~RecovDocList()
}
//===============================================
-void RecovDocList::InitEntry( SvTreeListEntry* pEntry ,
- const XubString& sText ,
- const Image& aImage1,
- const Image& aImage2,
- SvLBoxButtonKind eButtonKind)
+void RecovDocList::InitEntry(SvTreeListEntry* pEntry,
+ const OUString& rText,
+ const Image& rImage1,
+ const Image& rImage2,
+ SvLBoxButtonKind eButtonKind)
{
- SvTabListBox::InitEntry(pEntry, sText, aImage1, aImage2, eButtonKind);
+ SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind);
DBG_ASSERT( TabCount() == 2, "*RecovDocList::InitEntry(): structure missmatch" );
SvLBoxString* pCol = (SvLBoxString*)pEntry->GetItem(2);
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 2f877b1..bcfc2e0 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -138,9 +138,9 @@ XubString SvxFontListBox::GetSelectEntry() const
}
void SvxFontListBox::InitEntry(
- SvTreeListEntry* pEntry, const XubString& rEntryText,
+ SvTreeListEntry* pEntry, const OUString& rEntryText,
const Image& rCollImg, const Image& rExpImg,
- SvLBoxButtonKind eButtonKind )
+ SvLBoxButtonKind eButtonKind)
{
if( mbUseFont )
{
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 4b2cec0..919ec65 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1450,10 +1450,10 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt )
//------------------------------------------------------------------------
void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry,
- const XubString& rStr,
+ const OUString& rStr,
const Image& rImg1,
const Image& rImg2,
- SvLBoxButtonKind eButtonKind)
+ SvLBoxButtonKind eButtonKind)
{
SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
SvLBoxString* pString = NULL;
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index e037ea4..5c3b2f0 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -591,11 +591,11 @@ class RecovDocList : public SvxSimpleTable
Image m_aYellowCheckImg;
Image m_aRedCrossImg;
- String m_aSuccessRecovStr;
- String m_aOrigDocRecovStr;
- String m_aRecovFailedStr;
- String m_aRecovInProgrStr;
- String m_aNotRecovYetStr;
+ OUString m_aSuccessRecovStr;
+ OUString m_aOrigDocRecovStr;
+ OUString m_aRecovFailedStr;
+ OUString m_aRecovInProgrStr;
+ OUString m_aNotRecovYetStr;
//-------------------------------------------
// interface
@@ -610,11 +610,11 @@ class RecovDocList : public SvxSimpleTable
//---------------------------------------
/** @short TODO */
- virtual void InitEntry( SvTreeListEntry* pEntry ,
- const XubString& sText ,
- const Image& aImage1,
- const Image& aImage2,
- SvLBoxButtonKind eButtonKind);
+ virtual void InitEntry(SvTreeListEntry* pEntry,
+ const OUString& rText,
+ const Image& rImage1,
+ const Image& rImage2,
+ SvLBoxButtonKind eButtonKind);
};
//===============================================
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 816ed67..805cd8c 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -284,7 +284,7 @@ protected:
virtual void KeyInput( const KeyEvent& rKEvt );
virtual void Command( const CommandEvent& rEvt );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- virtual void InitEntry(SvTreeListEntry* pEntry, const XubString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind);
+ virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind);
virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True );
virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection );
virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText );
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index 01a721f..657f78e 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -535,7 +535,7 @@ public:
SvTreeListEntry* findAtom( Atom* pAtom );
- virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&);
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&);
virtual void SetTabs();
private:
@@ -591,7 +591,8 @@ void AtomContainerTreeListBox::SetTabs()
AddTab( nStartPos, SV_LBOXTAB_DYNAMIC|SV_LBOXTAB_ADJUST_LEFT | SV_LBOXTAB_SHOW_SELECTION );
}
-void AtomContainerTreeListBox::InitEntry(SvTreeListEntry* pEntry,const XubString& aStr,const Image& aCollEntryBmp,const Image& aExpEntryBmp)
+void AtomContainerTreeListBox::InitEntry(SvTreeListEntry* pEntry, const OUString& aStr,
+ const Image& aCollEntryBmp, const Image& aExpEntryBmp)
{
pEntry->AddItem( new SvLBoxContextBmp( pEntry,0, aCollEntryBmp,aExpEntryBmp, SVLISTENTRYFLAG_EXPANDED ) );
pEntry->AddItem( new SvLBoxContextBmp( pEntry,0, maImgAtom, maImgAtom, SVLISTENTRYFLAG_EXPANDED ) );
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index 29445ac..3d26863 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.hxx
@@ -110,7 +110,7 @@ class SwContentTree : public SvTreeListBox
protected:
virtual void RequestHelp( const HelpEvent& rHEvt );
- virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
virtual void DataChanged( const DataChangedEvent& rDCEvt );
SwNavigationPI* GetParentWindow(){return
@@ -292,7 +292,7 @@ protected:
virtual void GetFocus();
virtual void SelectHdl();
virtual void DeselectHdl();
- virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
void Clear();
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 86f8718..78a749d 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -3135,7 +3135,7 @@ public:
};
void SwContentTree::InitEntry(SvTreeListEntry* pEntry,
- const XubString& rStr ,const Image& rImg1,const Image& rImg2,
+ const OUString& rStr ,const Image& rImg1,const Image& rImg2,
SvLBoxButtonKind eButtonKind)
{
sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Spalte1";2=="Spalte2"
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 4d2d08c..c086b4f 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -1224,7 +1224,7 @@ IMPL_STATIC_LINK_NOINSTANCE(SwGlobalTree, ShowFrameHdl, SwGlobalTree*, EMPTYARG)
}
void SwGlobalTree::InitEntry(SvTreeListEntry* pEntry,
- const XubString& rStr ,const Image& rImg1,const Image& rImg2,
+ const OUString& rStr ,const Image& rImg1,const Image& rImg2,
SvLBoxButtonKind eButtonKind)
{
sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Spalte1";2=="Spalte2"
More information about the Libreoffice-commits
mailing list