sw/inc/fmturl.hxx | 2 +-
sw/source/core/layout/atrfrm.cxx | 7 ++++---
sw/uiconfig/swriter/ui/columnpage.ui | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 8cb7d461fb1466477a18500bf25d42fad14e83ca
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jan 21 09:44:40 2013 +0000
Resolves: fdo#58749 wrong custom widget libname in columns page
Change-Id: Ia11d30816b920b60367b8a0b7bd70d4bb4614ded
diff --git a/sw/uiconfig/swriter/ui/columnpage.ui
b/sw/uiconfig/swriter/ui/columnpage.ui
index 15fa2f3..31576a9 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -236,7 +236,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="swuilo:SwColExample" id="pageexample">
+ <object class="swlo:SwColExample" id="pageexample">
<property name="visible">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
@@ -249,7 +249,7 @@
</packing>
</child>
<child>
- <object class="swuilo:SwColumnOnlyExample" id="frameexample">
+ <object class="swlo:SwColumnOnlyExample" id="frameexample">
<property name="visible">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
commit 891e460b1296ba114bc7ef4142f8b3b761794974
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Jan 20 11:07:21 2013 +0000
ditch some pesty XubStrings
Change-Id: I42a80b12d843b95e2ddc0872ee793ebbda050066
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index cc78d9c..367c465 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -60,7 +60,7 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
nMemberId = 0 );
void SetTargetFrameName( const String& rStr ) { sTargetFrameName = rStr; }
- void SetURL( const String &rURL, sal_Bool bServerMap );
+ void SetURL(const OUString &rURL, bool bServerMap);
void SetMap( const ImageMap *pM ); ///< Pointer will be copied.
const String &GetTargetFrameName()const { return sTargetFrameName; }
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 180b145..cbb5038 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1740,7 +1740,7 @@ SfxPoolItem* SwFmtURL::Clone( SfxItemPool* ) const
return new SwFmtURL( *this );
}
-void SwFmtURL::SetURL( const XubString &rURL, sal_Bool bServerMap )
+void SwFmtURL::SetURL(const OUString &rURL, bool bServerMap)
{
sURL = rURL;
bIsServerMap = bServerMap;
@@ -1751,6 +1751,7 @@ void SwFmtURL::SetMap( const ImageMap *pM )
delete pMap;
pMap = pM ? new ImageMap( *pM ) : 0;
}
+
extern const SvEventDescription* sw_GetSupportedMacroItems();
bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -2086,7 +2087,7 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
// here we convert always!
nMemberId &= ~CONVERT_TWIPS;
bool bRet = true;
- XubString aRet;
+ OUString aRet;
switch ( nMemberId )
{
case MID_CHAIN_PREVNAME:
@@ -2101,7 +2102,7 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
OSL_ENSURE( !this, "unknown MemberId" );
bRet = false;
}
- rVal <<= OUString(aRet);
+ rVal <<= aRet;
return bRet;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
