[Libreoffice-commits] core.git: editeng/source
editeng/source/outliner/outlvw.cxx |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 66b86df5736e84888e2e6d54079e4adef819bbb5 Author: Ivan Timofeev Date: Sat Mar 9 19:27:15 2013 +0400 related to fdo#47018: fix DBG_ASSERT in EditEngine::QuickMarkInvalid regression from 2a6abe21ca8723123c5957369c0c518db37ad02e Change-Id: I007c54d5b6d28bfbf0bf21c4b85d408181731fd2 diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index eb3f877..6bbbf42 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -919,7 +919,9 @@ void OutlinerView::ToggleBullets() // to sal_uInt16 without check, if the count is 0. sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount()); pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount ); -pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) ); + +sal_uInt16 nEndPara = (nParaCount > 0) ? nParaCount-1 : nParaCount; +pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nEndPara, 0 ) ); pOwner->pEditEngine->SetUpdateMode( bUpdate ); @@ -951,9 +953,10 @@ void OutlinerView::EnableBullets() // It is not a good idea to substract 1 from a count and cast the result // to sal_uInt16 without check, if the count is 0. sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount()); - pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount ); -pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) ); + +sal_uInt16 nEndPara = (nParaCount > 0) ? nParaCount-1 : nParaCount; +pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nEndPara, 0 ) ); pOwner->pEditEngine->SetUpdateMode( bUpdate ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/inc editeng/source
editeng/inc/editeng/editeng.hxx |2 +-
editeng/inc/editeng/outliner.hxx |2 +-
editeng/source/editeng/editeng.cxx |2 +-
editeng/source/editeng/impedit.hxx |4 ++--
editeng/source/outliner/outlin2.cxx |2 +-
editeng/source/outliner/outliner.cxx |2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit c487fa125ed9fb59ba2507d5f0f947d5e425bc61
Author: Ivan Timofeev
Date: Sat Mar 9 22:02:47 2013 +0400
const-correctness
Change-Id: I15033051cfa4baafde4736abf366ca8c03778b88
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 48e236c..6161671 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -372,7 +372,7 @@ public:
voidQuickMarkToBeRepainted( sal_uInt16 nPara );
voidSetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16
nY = 100 );
-voidGetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY );
+voidGetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY )
const;
voidSetEditTextObjectPool( SfxItemPool* pPool );
SfxItemPool*GetEditTextObjectPool() const;
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 61e6a41..70531b0 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -955,7 +955,7 @@ public:
sal_BoolIsTextPos( const Point& rPaperPos, sal_uInt16 nBorder,
sal_Bool* pbBuuletPos );
voidSetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16
nY = 100 );
-voidGetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY );
+voidGetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY )
const;
voidEraseVirtualDevice();
sal_BoolShouldCreateBigTextObject() const;
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 1c8eda1..6655737 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2359,7 +2359,7 @@ void EditEngine::SetGlobalCharStretching( sal_uInt16 nX,
sal_uInt16 nY )
pImpEditEngine->SetCharStretching( nX, nY );
}
-void EditEngine::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY )
+void EditEngine::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY )
const
{
DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->GetCharStretching( rX, rY );
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index dcb7ad0..2cd8a6d 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -952,7 +952,7 @@ public:
SvxCellVerJustify GetVerJustification( sal_uInt16 nPara ) const;
voidSetCharStretching( sal_uInt16 nX, sal_uInt16 nY );
-inline void GetCharStretching( sal_uInt16& rX, sal_uInt16& rY );
+inline void GetCharStretching( sal_uInt16& rX, sal_uInt16& rY )
const;
voidSetBigTextObjectStart( sal_uInt16 nStartAtPortionCount
){ nBigTextObjectStart = nStartAtPortionCount; }
sal_uInt16 GetBigTextObjectStart() const
{ return nBigTextObjectStart; }
@@ -1083,7 +1083,7 @@ inline ParaPortion* ImpEditEngine::FindParaPortion(
ContentNode* pNode )
return GetParaPortions()[ nPos ];
}
-inline void ImpEditEngine::GetCharStretching( sal_uInt16& rX, sal_uInt16& rY )
+inline void ImpEditEngine::GetCharStretching( sal_uInt16& rX, sal_uInt16& rY )
const
{
rX = nStretchX;
rY = nStretchY;
diff --git a/editeng/source/outliner/outlin2.cxx
b/editeng/source/outliner/outlin2.cxx
index 0d3a2da..8fea84b 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -591,7 +591,7 @@ void Outliner::SetGlobalCharStretching( sal_uInt16 nX,
sal_uInt16 nY )
pEditEngine->SetGlobalCharStretching( nX, nY );
}
-void Outliner::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY )
+void Outliner::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->GetGlobalCharStretching( rX, rY );
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index e81286c..259e5d4 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -872,7 +872,7 @@ Font Outliner::ImpCalcBulletFont( sal_uInt16 nPara ) const
// Use original scale...
sal_uInt16 nStretchX, nStretchY;
-const_cast(this)->GetGlobalCharStretching(nStretchX, nStretchY);
+GetGlobalCharStretching(nStretchX, nStretchY);
sal_uInt16 nScale = pFmt->GetBulletRelSize() * nStretchY / 100;
sal_uLong nScaledLineHeight = aStdFont.GetSize().Height();
_
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/global.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c0da80faaf1ee70b503b4a7bb437a51219259a49
Author: Ivan Timofeev
Date: Fri Mar 15 08:40:55 2013 +0400
fix "simplify copy"
the second argument is a count
Change-Id: I1b6d7db8ba3ac83ef0be091c25e28ad93375d432
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 3428997..1a199c7 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -831,7 +831,7 @@ void ScGlobal::EraseQuotes( OUString& rString, sal_Unicode
cQuote, bool bUnescap
{
if ( IsQuoted( rString, cQuote ) )
{
-rString = rString.copy( 1, rString.getLength() - 1 );
+rString = rString.copy( 1, rString.getLength() - 2 );
if (bUnescapeEmbedded)
{
sal_Unicode pQ[3];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - comphelper/inc comphelper/source filter/source framework/inc framework/qa framework/source l10ntools/source odk/examples sfx2/source svx/source ucbhelper/in
comphelper/inc/comphelper/mediadescriptor.hxx
|8
comphelper/inc/comphelper/sequenceashashmap.hxx
|4 ++--
comphelper/source/misc/locale.cxx
|2 +-
comphelper/source/misc/numberedcollection.cxx
|2 +-
filter/source/config/cache/cacheitem.hxx
|6 +++---
filter/source/config/cache/filtercache.cxx
|2 +-
filter/source/config/cache/filtercache.hxx
|4 ++--
filter/source/config/cache/typedetection.cxx
|2 +-
framework/inc/classes/propertysethelper.hxx
|2 +-
framework/inc/dispatch/interceptionhelper.hxx
|2 +-
framework/inc/interaction/quietinteraction.hxx
|2 +-
framework/inc/properties.h
|4 ++--
framework/qa/complex/loadAllDocuments/InteractionHandler.java
|2 +-
framework/source/accelerators/storageholder.cxx
|4 ++--
framework/source/classes/framecontainer.cxx
|2 +-
framework/source/dispatch/dispatchprovider.cxx
|2 +-
framework/source/dispatch/mailtodispatcher.cxx
|2 +-
framework/source/inc/loadenv/actionlockguard.hxx
|4 ++--
framework/source/inc/loadenv/targethelper.hxx
|2 +-
framework/source/jobs/joburl.cxx
|2 +-
framework/source/loadenv/loadenv.cxx
|4 ++--
framework/source/services/autorecovery.cxx
|2 +-
framework/source/services/desktop.cxx
|4 ++--
framework/source/services/dispatchhelper.cxx
|2 +-
framework/source/services/frame.cxx
|8
l10ntools/source/filter/utils/Cache.java
|2 +-
l10ntools/source/filter/utils/FileHelper.java
|2 +-
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
|4 ++--
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
|2 +-
sfx2/source/appl/sfxhelp.cxx
|2 +-
sfx2/source/doc/docfile.cxx
|2 +-
sfx2/source/toolbox/tbxitem.cxx
|2 +-
svx/source/dialog/simptabl.cxx
|2 +-
svx/source/form/formcontroller.cxx
|2 +-
ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
|2 +-
unotools/inc/unotools/securityoptions.hxx
|2 +-
36 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit a71946505b853ca3db7fd4c3a7df7bfc62626ed2
Author: Ivan Timofeev
Date: Sun Feb 17 13:56:11 2013 +0400
fix SvxSimpleTable size
Change-Id: I74b082e090cc382b699720f1cfc70f1920ff5db4
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 5fa4077..c32ed74 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -125,7 +125,7 @@ SvxSimpleTable::~SvxSimpleTable()
void SvxSimpleTable::UpdateViewSize()
{
-Size theWinSize=m_rParentTableContainer.GetSizePixel();
+Size theWinSize=m_rParentTableContainer.GetOutputSizePixel();
Size HbSize=aHeaderBar.GetSizePixel();
HbSize.Width()=theWinSize.Width();
commit e2f97dcc1006aceb80c4805c0e1cb5b2f40ab7b0
Author: Ivan Timofeev
Date: Wed Feb 13 18:25:22 2013 +0400
spelling: otherwhise -> otherwise
Change-Id: I2d89edbb2574b4e677c9a0682bc829d9476b54db
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx
b/comphelper/inc/comphelper/mediadescriptor.hxx
index 8c55f85..ac045dc 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/
[Libreoffice-commits] core.git: shell/source tubes/source ucb/source
shell/source/backends/gconfbe/gconfaccess.cxx |2 ++
shell/source/sessioninstall/SyncDbusSessionHelper.cxx |2 ++
tubes/source/manager.cxx |2 ++
ucb/source/ucp/gio/gio_provider.cxx |4 ++--
4 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 025857d81d4781a95cda4e790808b05b97eb97d9
Author: Ivan Timofeev
Date: Wed Apr 17 20:04:45 2013 +0400
WaE: g_type_init has been deprecated since GLib 2.36
Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
Reviewed-on: https://gerrit.libreoffice.org/3434
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx
b/shell/source/backends/gconfbe/gconfaccess.cxx
index 1a1131c..d5b864d 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,8 +51,10 @@ GConfClient* getGconfClient()
static GConfClient* mClient= 0;
if (mClient == NULL)
{
+#if !defined(GLIB_VERSION_2_36)
/* initialize glib object type library */
g_type_init();
+#endif
GError* aError = NULL;
if (!gconf_init(0, NULL, &aError))
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index e833784..a39c847 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -62,7 +62,9 @@ namespace shell { namespace sessioninstall
{
SyncDbusSessionHelper::SyncDbusSessionHelper(Reference
const&)
{
+#if !defined(GLIB_VERSION_2_36)
g_type_init ();
+#endif
}
void SAL_CALL SyncDbusSessionHelper::InstallPackageNames( const
::sal_uInt32 nXid, const Sequence< OUString >& vPackages, const OUString&
sInteraction ) throw (RuntimeException)
{
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 70d9e44..a7acc3f 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -885,7 +885,9 @@ TeleManagerImpl::TeleManagerImpl()
mpFileTransferClient( NULL),
mpAccountManager( NULL)
{
+#if !defined(GLIB_VERSION_2_36)
g_type_init();
+#endif
}
TeleManagerImpl::~TeleManagerImpl()
diff --git a/ucb/source/ucp/gio/gio_provider.cxx
b/ucb/source/ucp/gio/gio_provider.cxx
index aad78b3..acd6e14 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,9 +100,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL
ucpgio1_component_getFactory( co
uno::Reference< lang::XMultiServiceFactory > xSMgr
(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory;
-
+#if !defined(GLIB_VERSION_2_36)
g_type_init();
-
+#endif
if (
!::gio::ContentProvider::getImplementationName_Static().compareToAscii(
pImplName ) )
xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source tubes/source ucb/source
shell/source/backends/gconfbe/gconfaccess.cxx |2 +-
shell/source/sessioninstall/SyncDbusSessionHelper.cxx |2 +-
tubes/source/manager.cxx |2 +-
ucb/source/ucp/gio/gio_provider.cxx |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9dd52eb86a9122e34c307a9160ae3ccd5706c94e
Author: Ivan Timofeev
Date: Fri Apr 19 17:41:20 2013 +0400
use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XX
Michael Meeks pointed out that the latter can cause problems.
Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx
b/shell/source/backends/gconfbe/gconfaccess.cxx
index d5b864d..d1b4b0d 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,7 +51,7 @@ GConfClient* getGconfClient()
static GConfClient* mClient= 0;
if (mClient == NULL)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
/* initialize glib object type library */
g_type_init();
#endif
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index a39c847..49c1344 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -62,7 +62,7 @@ namespace shell { namespace sessioninstall
{
SyncDbusSessionHelper::SyncDbusSessionHelper(Reference
const&)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init ();
#endif
}
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index a7acc3f..c5b5c39 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -885,7 +885,7 @@ TeleManagerImpl::TeleManagerImpl()
mpFileTransferClient( NULL),
mpAccountManager( NULL)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init();
#endif
}
diff --git a/ucb/source/ucp/gio/gio_provider.cxx
b/ucb/source/ucp/gio/gio_provider.cxx
index acd6e14..6737417 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,7 +100,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL
ucpgio1_component_getFactory( co
uno::Reference< lang::XMultiServiceFactory > xSMgr
(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory;
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init();
#endif
if (
!::gio::ContentProvider::getImplementationName_Static().compareToAscii(
pImplName ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/optviewpage.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ff65f9af46e1b63d17038ebf1229f974dcb7a92b Author: Ivan Timofeev Date: Thu Feb 21 16:06:38 2013 +0400 windowsize must be a MetricField Change-Id: I360de01d1afa129bec2dc9aabfb16820ec5e3269 diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index f1cb8c7..2cc72b1 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -43,7 +43,7 @@ 0 Sc_aling True -windowsize +windowsize:0% 0 @@ -53,7 +53,7 @@ - + True True start ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/services/backingwindow.hxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit ecd8b349015ef43bc2407f6ebf2053cb7b3b6c6f Author: Ivan Timofeev Date: Fri Feb 22 23:04:18 2013 +0400 Start Center: update hardcoded borders to match the new images Change-Id: Ib3dae9b06bcd2cfe5e73b723d9ea2e5856073651 diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index 94c16dd..6d98722 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -119,10 +119,10 @@ namespace framework static const int nItemId_Extensions = 1; static const int nItemId_Info = 3; static const int nItemId_TplRep = 4; -static const int nShadowTop = 37; -static const int nShadowLeft = 38; -static const int nShadowRight = 38; -static const int nShadowBottom = 38; +static const int nShadowTop = 31; +static const int nShadowLeft = 35; +static const int nShadowRight = 45; +static const int nShadowBottom = 40; void loadImage( const ResId& i_rId, PushButton& i_rButton ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/filter/ppt/pptin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5aa1307df6da9f8c17fa01d54be4d4184a31b299
Author: Ivan Timofeev
Date: Fri Feb 22 23:57:57 2013 +0400
fix Search->indexOf change
Change-Id: I64eb8128c5719a5e7601f15367342e98140e0789
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 9226f01..0925969 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -115,7 +115,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument,
SvStream& rDocStream, SvSto
{
OUString aComment;
aPropItem.Read( aComment );
-if ( aComment.indexOf( "Applixware", 0 ) != STRING_NOTFOUND )
+if ( aComment.indexOf( "Applixware" ) >= 0 )
{
nImportFlags |= PPT_IMPORTFLAGS_NO_TEXT_ASSERT;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - framework/source
framework/source/services/backingwindow.hxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 0779403109cf1248a71821631d6bb44a600d88a9 Author: Ivan Timofeev Date: Fri Feb 22 23:04:18 2013 +0400 Start Center: update hardcoded borders to match the new images Change-Id: Ib3dae9b06bcd2cfe5e73b723d9ea2e5856073651 (cherry picked from commit ecd8b349015ef43bc2407f6ebf2053cb7b3b6c6f) Reviewed-on: https://gerrit.libreoffice.org/2341 Reviewed-by: Stefan Knorr Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index fdacdbf..7999dd0 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -120,10 +120,10 @@ namespace framework static const int nItemId_Extensions = 1; static const int nItemId_Info = 3; static const int nItemId_TplRep = 4; -static const int nShadowTop = 37; -static const int nShadowLeft = 38; -static const int nShadowRight = 38; -static const int nShadowBottom = 38; +static const int nShadowTop = 31; +static const int nShadowLeft = 35; +static const int nShadowRight = 45; +static const int nShadowBottom = 40; void loadImage( const ResId& i_rId, PushButton& i_rButton ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/compressgraphicdialog.hrc |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 4fcea7f0c414bea7975694465ae4e4436bdef24b Author: Ivan Timofeev Date: Thu Feb 28 22:11:21 2013 +0400 Global resources should have an identifier >= 256. Change-Id: I00b72779f7400d532e87907308198269a5f8784d diff --git a/svx/source/dialog/compressgraphicdialog.hrc b/svx/source/dialog/compressgraphicdialog.hrc index 4b3060d..584e976 100644 --- a/svx/source/dialog/compressgraphicdialog.hrc +++ b/svx/source/dialog/compressgraphicdialog.hrc @@ -16,6 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define STR_IMAGE_ORIGINAL_SIZE 1 -#define STR_IMAGE_VIEW_SIZE 2 -#define STR_IMAGE_CAPACITY 3 +#define STR_IMAGE_ORIGINAL_SIZE 256 +#define STR_IMAGE_VIEW_SIZE 257 +#define STR_IMAGE_CAPACITY 258 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
build failure with ICU 4.8
Hi, I build --with-system-icu, ICU version is 4.8.1.1, and I have got this: createRuleBasedBreakIterator: ICU Error "U_ILLEGAL_ARGUMENT_ERROR" at line 64, column 7 on i18npool/source/breakiterator/data/line.txt, where line 64 is: $CJ = [:LineBreak = Conditional_Japanese_Starter:]; ICU 4.8 does not know Conditional_Japanese_Starter (only ICU 49 does), I think we should put that conditional stuff from http://cgit.freedesktop.org/libreoffice/core/commit/?id=92a9b7780c6e13a4da3b12794342edbc4c09ef51 back. Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - include/vcl vcl/source
include/vcl/outdev.hxx |4 -
vcl/source/control/button.cxx | 12 +---
vcl/source/control/edit.cxx |2
vcl/source/control/lstbox.cxx |8 +--
vcl/source/control/scrbar.cxx | 98
vcl/source/gdi/outdevnative.cxx |4 -
vcl/source/window/status.cxx| 17 +++---
7 files changed, 70 insertions(+), 75 deletions(-)
New commits:
commit 231fb4182fc9e81f801ff1d1355f7a613d0856c2
Author: Ivan Timofeev
Date: Sat Jun 29 15:33:38 2013 +0400
make HitTestNativeControl const
Change-Id: I1d3f09cce87fadd8bdc18b2775ebe2a6968d99c1
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index b1b143f..b97f416 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1194,7 +1194,7 @@ public:
ControlPart nPart,
const Rectangle&
rControlRegion,
const Point& aPos,
-sal_Bool& rIsInside );
+sal_Bool& rIsInside ) const;
// Request rendering of a particular control and/or part
sal_BoolDrawNativeControl( ControlType nType,
diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index fe0ed27..68e65a3 100644
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -166,7 +166,7 @@ sal_Bool OutputDevice::HitTestNativeControl( ControlType
nType,
ControlPart nPart,
const Rectangle& rControlRegion,
const Point& aPos,
- sal_Bool& rIsInside )
+ sal_Bool& rIsInside ) const
{
if( !lcl_enableNativeWidget( *this ) )
return sal_False;
commit 7d1e257a6ba2bbb0120753a09c140200ab913991
Author: Ivan Timofeev
Date: Sat Jun 29 15:32:09 2013 +0400
make IsNativeControlSupported const
Change-Id: I4346b2df94fc8767fce734362901b6248bb6342d
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index a5781ee..6ee8944 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2891,10 +2891,8 @@ long RadioButton::ImplGetImageToTextDistance() const
Size RadioButton::ImplGetRadioImageSize() const
{
Size aSize;
-// why are IsNativeControlSupported and GetNativeControlRegion not const ?
-RadioButton* pThis = const_cast(this);
bool bDefaultSize = true;
-if( pThis->IsNativeControlSupported( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL
) )
+if( IsNativeControlSupported( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL ) )
{
ImplControlValue aControlValue;
// #i45896# workaround gcc3.3 temporary problem
@@ -3825,10 +3823,8 @@ long CheckBox::ImplGetImageToTextDistance() const
Size CheckBox::ImplGetCheckImageSize() const
{
Size aSize;
-// why are IsNativeControlSupported and GetNativeControlRegion not const ?
-CheckBox* pThis = const_cast(this);
bool bDefaultSize = true;
-if( pThis->IsNativeControlSupported( CTRL_CHECKBOX, PART_ENTIRE_CONTROL ) )
+if( IsNativeControlSupported( CTRL_CHECKBOX, PART_ENTIRE_CONTROL ) )
{
ImplControlValue aControlValue;
// #i45896# workaround gcc3.3 temporary problem
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 7ec6fd7..1d08e84 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -1595,9 +1595,8 @@ Size StatusBar::CalcWindowSizePixel() const
long nMinHeight = GetTextHeight();
const long nBarTextOffset = STATUSBAR_OFFSET_TEXTY*2;
long nProgressHeight = nMinHeight + nBarTextOffset;
-// FIXME: IsNativeControlSupported and GetNativeControlRegion should be
const ?
-StatusBar* pThis = const_cast( this );
-if( pThis->IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
+
+if( IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
{
ImplControlValue aValue;
Rectangle aControlRegion( (const Point&)Point(), Size( nCalcWidth,
nMinHeight ) );
@@ -1611,7 +1610,7 @@ Size StatusBar::CalcWindowSizePixel() const
}
if( mpImplData->mbDrawItemFrames &&
-pThis->IsNativeControlSupported( CTRL_FRAME, PART_BORDER ) )
+IsNativeControlSupported( CTRL_FRAME, PART_BORDER ) )
{
ImplControlValue aControlValue( FRAME_DRAW_NODRAW );
Rectangle aBound, aContent;
commit 1a8addc13734164d649974ea2f6426d12e8992a2
Author: Ivan Timofeev
Date: Sat Jun 29 15:20:03 2013 +0400
GetNativeControlRegion is const
Change-Id: I0b34001e99036f197a50ff24b854e5a07eac6f06
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 4a649c2..b1b143f 100644
--- a/include/vcl/outdev.hx
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkgdi.hxx|4 ++
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 39 ++
2 files changed, 32 insertions(+), 11 deletions(-)
New commits:
commit cc06e7b6b8b73ae68a2eea72d94c6f45c9fbf497
Author: Ivan Timofeev
Date: Mon Jul 1 21:29:29 2013 +0400
gtk3: for checkbox map BUTTONVALUE_MIXED to GTK_STATE_FLAG_INCONSISTENT
Change-Id: I5f5810a1e2dc56afb0fba7fde20a383980e3ba51
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 1821cbe..350d1e9 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -853,7 +853,9 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart
break;
case CTRL_CHECKBOX:
flags = (GtkStateFlags)(flags |
-( (aValue.getTristateVal() == BUTTONVALUE_ON) ?
GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL));
+( (aValue.getTristateVal() == BUTTONVALUE_ON) ?
GTK_STATE_FLAG_ACTIVE :
+ (aValue.getTristateVal() == BUTTONVALUE_MIXED) ?
GTK_STATE_FLAG_INCONSISTENT :
+ GTK_STATE_FLAG_NORMAL));
context = mpCheckButtonStyle;
styleClass = GTK_STYLE_CLASS_CHECK;
renderType = RENDER_CHECK;
commit 76c9d45ccf8480f8b73815607ff8701a3d41a649
Author: Ivan Timofeev
Date: Mon Jul 1 21:24:25 2013 +0400
gtk3: add indicator-spacing to size of checkbox/radiobutton
Change-Id: Ifea43607c8cd5a8047796b7d2efdf14289b029e2
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 4d5ff7c..912e27e 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -103,6 +103,10 @@ private:
ControlType nType,
ControlPart nPart,
const ImplControlValue& aValue );
+void PaintCheckOrRadio(GtkStyleContext *context,
+ cairo_t *cr,
+ const Rectangle& rControlRectangle,
+ ControlType nType);
static bool style_loaded;
};
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 3448615..1821cbe 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -751,6 +751,24 @@ void GtkSalGraphics::PaintCombobox( GtkStyleContext
*context,
arrowRect.GetWidth() );
}
+void GtkSalGraphics::PaintCheckOrRadio(GtkStyleContext *context,
+ cairo_t *cr,
+ const Rectangle& rControlRectangle,
+ ControlType nType)
+{
+gint x, y, indicator_size;
+gtk_style_context_get_style(mpCheckButtonStyle,
+"indicator-size", &indicator_size,
+NULL );
+
+x = (rControlRectangle.GetWidth() - indicator_size) / 2;
+y = (rControlRectangle.GetHeight() - indicator_size) / 2;
+if (nType == CTRL_CHECKBOX)
+gtk_render_check(context, cr, x, y, indicator_size, indicator_size);
+else if (nType == CTRL_RADIOBUTTON)
+gtk_render_option(context, cr, x, y, indicator_size, indicator_size);
+}
+
sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart
nPart, const Rectangle& rControlRegion,
ControlState nState, const
ImplControlValue& aValue,
const OUString& )
@@ -891,14 +909,8 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart
rControlRegion.GetWidth(),
rControlRegion.GetHeight());
break;
case RENDER_CHECK:
-gtk_render_check(context, cr,
- 0, 0,
- rControlRegion.GetWidth(),
rControlRegion.GetHeight());
-break;
case RENDER_RADIO:
-gtk_render_option(context, cr,
- 0, 0,
- rControlRegion.GetWidth(),
rControlRegion.GetHeight());
+PaintCheckOrRadio(context, cr, rControlRegion, nType);
break;
case RENDER_LINE:
gtk_render_line(context, cr,
@@ -982,18 +994,21 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(
ControlType nType, ControlPart
{
/* TODO: all this funcions needs improvements */
Rectangle aEditRect = rControlRegion;
-gint indicator_size, point;
+gint indicator_size, indicator_spacing, point;
if(((nType == CTRL_CHECKBOX) || (nType == CTRL_RADIOBUTTON)) &&
nPart == PART_ENTIRE_CONTROL)
{
gtk_style_context_get_style( mpCheckButtonStyle,
"indicator-size", &indicator_size,
+
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/cellsuno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7c7ca0d0028cacad15a4fdc3dc02bc5f038c9f3c
Author: Ivan Timofeev
Date: Mon Jul 1 22:10:45 2013 +0400
WaE: pOldRanges may be used uninitialized
Change-Id: I22ff60e30b8c5697f648fcd6b7b22a302c6a2135
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 1d0a8e8..3a8f7cd 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7503,7 +7503,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
-ScPrintRangeSaver* pOldRanges;
+ScPrintRangeSaver* pOldRanges = NULL;
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkgdi.hxx|3 +-
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 38 +++---
2 files changed, 31 insertions(+), 10 deletions(-)
New commits:
commit db377e02c309c20419aef1360409be09fe50fc42
Author: Ivan Timofeev
Date: Tue Jul 2 12:23:38 2013 +0400
gtk3: Clearlooks theme paints scrollbar buttons depending on the style class
Change-Id: I8e464e4b71671eccb2c0467d74542e6ddda0f5a6
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index fd4282f..98da944 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -266,6 +266,8 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext
*context,
gdouble arrow1Angle;//
backward
gdouble arrow2Angle;//
forward
RectanglearrowRect;
+const gchar* button1StyleClass = NULL;
+const gchar* button2StyleClass = NULL;
gintslider_width = 0;
gintstepper_size = 0;
gintstepper_spacing = 0;
@@ -319,6 +321,8 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext
*context,
scrollbarOrientation = GTK_ORIENTATION_HORIZONTAL;
arrow1Angle = G_PI * 3 / 2;
arrow2Angle = G_PI / 2;
+button1StyleClass = GTK_STYLE_CLASS_LEFT;
+button2StyleClass = GTK_STYLE_CLASS_RIGHT;
if ( has_backward )
{
@@ -359,6 +363,8 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext
*context,
scrollbarOrientation = GTK_ORIENTATION_VERTICAL;
arrow1Angle = 0;
arrow2Angle = G_PI;
+button1StyleClass = GTK_STYLE_CLASS_TOP;
+button2StyleClass = GTK_STYLE_CLASS_BOTTOM;
if ( has_backward )
{
@@ -434,6 +440,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext
*context,
gtk_style_context_save(context);
gtk_style_context_set_state(context, stateFlags);
gtk_style_context_add_class(context, GTK_STYLE_CLASS_BUTTON);
+gtk_style_context_add_class(context, button1StyleClass);
gtk_render_background(context, cr,
button11BoundRect.Left(),
button11BoundRect.Top(),
@@ -460,6 +467,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext
*context,
gtk_style_context_save(context);
gtk_style_context_set_state(context, stateFlags);
gtk_style_context_add_class(context, GTK_STYLE_CLASS_BUTTON);
+gtk_style_context_add_class(context, button1StyleClass);
gtk_render_background(context, cr,
button12BoundRect.Left(),
button12BoundRect.Top(),
@@ -487,6 +495,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext
*context,
gtk_style_context_save(context);
gtk_style_context_set_state(context, stateFlags);
gtk_style_context_add_class(context, GTK_STYLE_CLASS_BUTTON);
+gtk_style_context_add_class(context, button2StyleClass);
gtk_render_background(context, cr,
button21BoundRect.Left(),
button21BoundRect.Top(),
@@ -513,6 +522,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext
*context,
gtk_style_context_save(context);
gtk_style_context_set_state(context, stateFlags);
gtk_style_context_add_class(context, GTK_STYLE_CLASS_BUTTON);
+gtk_style_context_add_class(context, button2StyleClass);
gtk_render_background(context, cr,
button22BoundRect.Left(), button22BoundRect.Top(),
commit 010391b647f15efbeeba4e1a8158ab6dd550aa6b
Author: Ivan Timofeev
Date: Tue Jul 2 12:06:13 2013 +0400
gtk3: gtk_vscrollbar_new is deprecated, use gtk_scrollbar_new
Change-Id: Iea6b6cd0147e42eab9889ea9a45aaf98c77cfaab
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 912e27e..d75e9dc 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -61,7 +61,8 @@ private:
GtkWidget *mpWindow;
static GtkStyleContext *mpButtonStyle;
static GtkStyleContext *mpEntryStyle;
-static GtkStyleContext *mpScrollbarStyle;
+static GtkStyleContext *mpVScrollbarStyle;
+static GtkStyleContext *mpHScrollbarStyle;
static GtkStyleContext *mpToolbarStyle;
static GtkStyleContext *mpToolButtonStyle;
static GtkStyleContext *mpCheckButtonStyle;
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 350d1e9..fd4282f 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -18,7 +18,8 @@
GtkStyleContext* GtkSalGraphics::mpButtonStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpEntryStyle = NULL;
-GtkStyleContext* GtkSalGraphics::mpScrollbarStyle = NULL;
+GtkStyleContext* GtkSalGraphics
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source vcl/unx
vcl/source/control/scrbar.cxx|4 ++--
vcl/source/gdi/salgdilayout.cxx |4 ++--
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +---
3 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 6d16423a82847c82f6915f03cdd0179c42d23929
Author: Ivan Timofeev
Date: Mon Jun 24 22:55:55 2013 +0400
fdo#66335: fix fdo#44582 and fdo#63254 differently
This combines the following cherry picked commits:
1) fdo#66335: gtk: Revert hacks for RTL scrollbars
returning false here in getNativeControlRegion results in a fallback to
square buttons in vcl scrollbar code. But there is no problem in gtk+
backend
in this case, let's fix the problem differently.
This reverts commits 898a3e84807bccbb876e3f5583728f6d24e05e9a and
e8e82bd2109b82ddd535cdac30303249c6b62942.
(cherry picked from commit 48e1d9c7afe5c2a39d9a08d7a38f7c8ff39d8c84)
2) fdo#44582: fix scrollbars in RTL UI
(cherry picked from commit e3a801e2454eed2e61202bbacca01fe3fcc20c1d)
3) fdo#63254: correct re-mirroring formula
This patch fixes horizontal scrollbar in Calc when a sheet is RTL and UI is
LTR.
When a particular window (horizontal scrollbar in this case) is RTL and a
whole
UI is LTR this code used for mirroring and re-mirroring back coordinates.
AFAICS
mirroring is correct, but re-mirroring is not.
The used formula comes from commit
69b684b12e42bf1396bdffca88ca880ac3c2e00b, and
the same formula appears in the other variant of overloaded function
"mirror":
mirror(sal_uInt32, const SalPoint*, SalPoint*, const OutputDevice*, bool),
but it does not affect the bug.
(cherry picked from commit a08f579e3704fbd97590f9b050d250ae445725a7)
Change-Id: If23ae46f1286048808faf878953dfa65e67d1962
Reviewed-on: https://gerrit.libreoffice.org/4621
Reviewed-by: Bosdonnat Cedric
Tested-by: Bosdonnat Cedric
Reviewed-by: Abdulaziz A Alayed
Tested-by: Abdulaziz A Alayed
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index b326915..d283daf 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -317,9 +317,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate )
if ( GetStyle() & WB_HORZ )
{
-if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_LEFT,
+if ( GetNativeControlRegion( CTRL_SCROLLBAR, IsRTLEnabled()?
PART_BUTTON_RIGHT: PART_BUTTON_LEFT,
aControlRegion, 0, ImplControlValue(), OUString(),
aBoundingRegion, aBtn1Region ) &&
- GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_RIGHT,
+ GetNativeControlRegion( CTRL_SCROLLBAR, IsRTLEnabled()?
PART_BUTTON_LEFT: PART_BUTTON_RIGHT,
aControlRegion, 0, ImplControlValue(), OUString(),
aBoundingRegion, aBtn2Region ) )
{
maBtn1Rect = aBtn1Region;
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 01137b6..f8c3d1c 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -107,7 +107,7 @@ void SalGraphics::mirror( long& x, const OutputDevice
*pOutDev, bool bBack ) con
{
long devX = pOutDevRef->GetOutOffXPixel(); // re-mirrored
mnOutOffX
if( bBack )
-x = x - pOutDevRef->GetOutputWidthPixel() + devX -
pOutDevRef->GetOutOffXPixel() + 1;
+x = devX + (pOutDevRef->GetOutputWidthPixel() + devX) - (x
+ 1);
else
x = pOutDevRef->GetOutputWidthPixel() - (x - devX) +
pOutDevRef->GetOutOffXPixel() - 1;
}
@@ -143,7 +143,7 @@ void SalGraphics::mirror( long& x, long& nWidth, const
OutputDevice *pOutDev, bo
{
long devX = pOutDevRef->GetOutOffXPixel(); // re-mirrored
mnOutOffX
if( bBack )
-x = x - pOutDevRef->GetOutputWidthPixel() + devX -
pOutDevRef->GetOutOffXPixel() + nWidth;
+x = devX + (pOutDevRef->GetOutputWidthPixel() + devX) - (x
+ nWidth);
else
x = pOutDevRef->GetOutputWidthPixel() - (x - devX) +
pOutDevRef->GetOutOffXPixel() - nWidth;
}
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 370a406..d8c645a 100755
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1048,13 +1048,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(
ControlType nType,
rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
if (!rNativeContentRegion.GetHeight())
rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
-//fdo#63254 horizontal scrool bar is
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source vcl/unx
vcl/source/control/scrbar.cxx|4 ++--
vcl/source/gdi/salgdilayout.cxx |4 ++--
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +---
3 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 54d8b3ae7ff97c798ea515b8196c1b2b9ccdf056
Author: Ivan Timofeev
Date: Mon Jun 24 22:55:55 2013 +0400
fdo#66335: fix fdo#44582 and fdo#63254 differently
This combines the following cherry picked commits:
1) fdo#66335: gtk: Revert hacks for RTL scrollbars
returning false here in getNativeControlRegion results in a fallback to
square buttons in vcl scrollbar code. But there is no problem in gtk+
backend
in this case, let's fix the problem differently.
This reverts commits 898a3e84807bccbb876e3f5583728f6d24e05e9a and
e8e82bd2109b82ddd535cdac30303249c6b62942.
(cherry picked from commit 48e1d9c7afe5c2a39d9a08d7a38f7c8ff39d8c84)
2) fdo#44582: fix scrollbars in RTL UI
(cherry picked from commit e3a801e2454eed2e61202bbacca01fe3fcc20c1d)
3) fdo#63254: correct re-mirroring formula
This patch fixes horizontal scrollbar in Calc when a sheet is RTL and UI is
LTR.
When a particular window (horizontal scrollbar in this case) is RTL and a
whole
UI is LTR this code used for mirroring and re-mirroring back coordinates.
AFAICS
mirroring is correct, but re-mirroring is not.
The used formula comes from commit
69b684b12e42bf1396bdffca88ca880ac3c2e00b, and
the same formula appears in the other variant of overloaded function
"mirror":
mirror(sal_uInt32, const SalPoint*, SalPoint*, const OutputDevice*, bool),
but it does not affect the bug.
(cherry picked from commit a08f579e3704fbd97590f9b050d250ae445725a7)
Conflicts:
vcl/source/control/scrbar.cxx
Change-Id: I0ccaa8998fe87403b3606828eaf3f5bd1dbe6bb4
Reviewed-on: https://gerrit.libreoffice.org/4622
Reviewed-by: Bosdonnat Cedric
Tested-by: Bosdonnat Cedric
Reviewed-by: Abdulaziz A Alayed
Tested-by: Abdulaziz A Alayed
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index b99ff26..6689904 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -330,9 +330,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate )
if ( GetStyle() & WB_HORZ )
{
-if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_LEFT,
+if ( GetNativeControlRegion( CTRL_SCROLLBAR, IsRTLEnabled()?
PART_BUTTON_RIGHT: PART_BUTTON_LEFT,
aControlRegion, 0, ImplControlValue(),
rtl::OUString(), aBoundingRegion, aBtn1Region ) &&
- GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_RIGHT,
+ GetNativeControlRegion( CTRL_SCROLLBAR, IsRTLEnabled()?
PART_BUTTON_LEFT: PART_BUTTON_RIGHT,
aControlRegion, 0, ImplControlValue(),
rtl::OUString(), aBoundingRegion, aBtn2Region ) )
{
maBtn1Rect = aBtn1Region;
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index bb1c55d..987d0cf 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -107,7 +107,7 @@ void SalGraphics::mirror( long& x, const OutputDevice
*pOutDev, bool bBack ) con
{
long devX = pOutDevRef->GetOutOffXPixel(); // re-mirrored
mnOutOffX
if( bBack )
-x = x - pOutDevRef->GetOutputWidthPixel() + devX -
pOutDevRef->GetOutOffXPixel() + 1;
+x = devX + (pOutDevRef->GetOutputWidthPixel() + devX) - (x
+ 1);
else
x = pOutDevRef->GetOutputWidthPixel() - (x - devX) +
pOutDevRef->GetOutOffXPixel() - 1;
}
@@ -143,7 +143,7 @@ void SalGraphics::mirror( long& x, long& nWidth, const
OutputDevice *pOutDev, bo
{
long devX = pOutDevRef->GetOutOffXPixel(); // re-mirrored
mnOutOffX
if( bBack )
-x = x - pOutDevRef->GetOutputWidthPixel() + devX -
pOutDevRef->GetOutOffXPixel() + nWidth;
+x = devX + (pOutDevRef->GetOutputWidthPixel() + devX) - (x
+ nWidth);
else
x = pOutDevRef->GetOutputWidthPixel() - (x - devX) +
pOutDevRef->GetOutOffXPixel() - nWidth;
}
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index e4bd038..e627257 100755
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1041,13 +1041,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(
ControlType nType,
rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
if (!rNativeContentRegion.GetHeig
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/unoobj/cellsuno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a33edacf6b477e661f96c00c9fc03450be31123c
Author: Ivan Timofeev
Date: Mon Jul 1 22:10:45 2013 +0400
WaE: pOldRanges may be used uninitialized
Change-Id: I22ff60e30b8c5697f648fcd6b7b22a302c6a2135
(cherry picked from commit 7c7ca0d0028cacad15a4fdc3dc02bc5f038c9f3c)
Signed-off-by: Eike Rathke
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 1d0a8e8..3a8f7cd 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7503,7 +7503,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
-ScPrintRangeSaver* pOldRanges;
+ScPrintRangeSaver* pOldRanges = NULL;
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sc/source
sc/source/ui/unoobj/cellsuno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 21aaeda9386cd20c29e8ffa07ade362f3995b507
Author: Ivan Timofeev
Date: Mon Jul 1 22:10:45 2013 +0400
WaE: pOldRanges may be used uninitialized
Change-Id: I22ff60e30b8c5697f648fcd6b7b22a302c6a2135
(cherry picked from commit 7c7ca0d0028cacad15a4fdc3dc02bc5f038c9f3c)
Signed-off-by: Eike Rathke
(cherry picked from commit a33edacf6b477e661f96c00c9fc03450be31123c)
Signed-off-by: Eike Rathke
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 0dbf506..a3f5bdb 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7452,7 +7452,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
-ScPrintRangeSaver* pOldRanges;
+ScPrintRangeSaver* pOldRanges = NULL;
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx reportdesign/source sc/source svx/source
include/svx/tbxcolorupdate.hxx |8 --
reportdesign/source/ui/dlg/Condition.cxx |2
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx |4 -
svx/source/sidebar/area/AreaPropertyPanel.cxx|2
svx/source/sidebar/line/LinePropertyPanel.cxx|2
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |2
svx/source/tbxctrls/extrusioncontrols.cxx|2
svx/source/tbxctrls/tbcontrl.cxx | 10 --
svx/source/tbxctrls/tbxcolorupdate.cxx | 70 +++
9 files changed, 39 insertions(+), 63 deletions(-)
New commits:
commit 15f79efe1522389d52d068d620beaa268aaebdeb
Author: Ivan Timofeev
Date: Sat Jun 22 16:00:41 2013 +0400
kill TBX_UPDATER_MODE_*
commit 4f036439f7597d33a9f90860d9a5b6ac28b270c7 "Kill unused
TBX_UPDATER_MODE_NONE." removed TBX_UPDATER_MODE_NONE, but it was
actually used, but written as literal 0 in ctor (default value for
nMode). Worse, TBX_UPDATER_MODE_NONE meant "draw a square color mark"
(!) and after removing it color-marks were not drawn for some buttons,
e.g. frame color button.
This patch makes use of TBX_UPDATER_MODE_CHAR_COLOR_NEW (which means
"draw a rectangle color mark") everywhere, TBX_UPDATER_MODE_CHAR_COLOR
and TBX_UPDATER_MODE_CHAR_BACKGROUND were unused.
Change-Id: I7452bf73227cd7038e5ea9ab740745125ca079b4
diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index 7dad6e7..3c9c100 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -33,10 +33,6 @@ namespace svx
{
//
-#define TBX_UPDATER_MODE_CHAR_COLOR 0x01
-#define TBX_UPDATER_MODE_CHAR_BACKGROUND0x02
-#define TBX_UPDATER_MODE_CHAR_COLOR_NEW 0x03
-
//
//= ToolboxButtonColorUpdater
//
@@ -49,14 +45,12 @@ namespace svx
public:
ToolboxButtonColorUpdater( sal_uInt16 nSlotId,
sal_uInt16 nTbxBtnId,
-ToolBox* ptrTbx,
-sal_uInt16 nMode = 0 );
+ToolBox* ptrTbx);
~ToolboxButtonColorUpdater();
voidUpdate( const Color& rColor );
private:
-sal_uInt16 mnDrawMode;
sal_uInt16 mnBtnId;
sal_uInt16 mnSlotId;
ToolBox*mpTbx;
diff --git a/reportdesign/source/ui/dlg/Condition.cxx
b/reportdesign/source/ui/dlg/Condition.cxx
index eee8c29..854ec4d 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -295,7 +295,7 @@ Condition::Condition( Window* _pParent,
IConditionalFormatAction& _rAction, ::rp
m_pBtnUpdaterBackgroundColor = new ::svx::ToolboxButtonColorUpdater(
SID_BACKGROUND_COLOR,
SID_BACKGROUND_COLOR, &m_aActions );
m_pBtnUpdaterFontColor = new ::svx::ToolboxButtonColorUpdater(
-SID_ATTR_CHAR_COLOR2,
SID_ATTR_CHAR_COLOR2, &m_aActions, TBX_UPDATER_MODE_CHAR_COLOR_NEW );
+SID_ATTR_CHAR_COLOR2,
SID_ATTR_CHAR_COLOR2, &m_aActions );
Show();
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index fbb6236..332b72d 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -221,10 +221,10 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
mpFillColorUpdater.reset( new
::svx::ToolboxButtonColorUpdater(SID_ATTR_BRUSH,
mpTBFillColor->GetItemId( UNO_BACKGROUNDCOLOR ),
-mpTBFillColor, TBX_UPDATER_MODE_CHAR_COLOR_NEW) );
+mpTBFillColor) );
mpLineColorUpdater.reset( new
::svx::ToolboxButtonColorUpdater(SID_FRAME_LINECOLOR,
mpTBLineColor->GetItemId( UNO_FRAMELINECOLOR ),
-mpTBLineColor, TBX_UPDATER_MODE_CHAR_COLOR_NEW) );
+mpTBLineColor) );
mpCellBorderUpdater.reset( new CellBorderUpdater(
mpTBCellBorder->GetItemId( UNO_SETBORDERSTYLE ), *mpTBCellBorder) );
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx
b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index df87602..c089631 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -87,7 +87,7 @@ AreaPropertyPanel::AreaPropertyPanel(
mpMTRTransparent(new MetricField(this, SVX_RES(MTR_TRANSPARENT))),
mpBTNGradientBackground(
[Libreoffice-commits] core.git: 3 commits - vcl/source vcl/unx
vcl/source/control/scrbar.cxx|4 ++--
vcl/source/gdi/salgdilayout.cxx |4 ++--
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +---
3 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit a08f579e3704fbd97590f9b050d250ae445725a7
Author: Ivan Timofeev
Date: Fri Jun 28 21:54:15 2013 +0400
fdo#63254: correct re-mirroring formula
This patch fixes horizontal scrollbar in Calc when a sheet is RTL and UI is
LTR.
When a particular window (horizontal scrollbar in this case) is RTL and a
whole
UI is LTR this code used for mirroring and re-mirroring back coordinates.
AFAICS
mirroring is correct, but re-mirroring is not.
The used formula comes from commit
69b684b12e42bf1396bdffca88ca880ac3c2e00b, and
the same formula appears in the other variant of overloaded function
"mirror":
mirror(sal_uInt32, const SalPoint*, SalPoint*, const OutputDevice*, bool),
but it does not affect the bug.
Change-Id: Iec9c53edce9d33be6b676d1094bed8bf92f2e435
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 9d54573..3d34a5f 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -119,7 +119,7 @@ void SalGraphics::mirror( long& x, const OutputDevice
*pOutDev, bool bBack ) con
{
long devX = pOutDevRef->GetOutOffXPixel(); // re-mirrored
mnOutOffX
if( bBack )
-x = x - pOutDevRef->GetOutputWidthPixel() + devX -
pOutDevRef->GetOutOffXPixel() + 1;
+x = devX + (pOutDevRef->GetOutputWidthPixel() + devX) - (x
+ 1);
else
x = pOutDevRef->GetOutputWidthPixel() - (x - devX) +
pOutDevRef->GetOutOffXPixel() - 1;
}
@@ -155,7 +155,7 @@ void SalGraphics::mirror( long& x, long& nWidth, const
OutputDevice *pOutDev, bo
{
long devX = pOutDevRef->GetOutOffXPixel(); // re-mirrored
mnOutOffX
if( bBack )
-x = x - pOutDevRef->GetOutputWidthPixel() + devX -
pOutDevRef->GetOutOffXPixel() + nWidth;
+x = devX + (pOutDevRef->GetOutputWidthPixel() + devX) - (x
+ nWidth);
else
x = pOutDevRef->GetOutputWidthPixel() - (x - devX) +
pOutDevRef->GetOutOffXPixel() - nWidth;
}
commit e3a801e2454eed2e61202bbacca01fe3fcc20c1d
Author: Ivan Timofeev
Date: Fri Jun 28 21:52:17 2013 +0400
fdo#44582: fix scrollbars in RTL UI
Change-Id: I518e9bcf673ffd1f17ecb51c2c4f962a2f722446
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index b326915..d283daf 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -317,9 +317,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate )
if ( GetStyle() & WB_HORZ )
{
-if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_LEFT,
+if ( GetNativeControlRegion( CTRL_SCROLLBAR, IsRTLEnabled()?
PART_BUTTON_RIGHT: PART_BUTTON_LEFT,
aControlRegion, 0, ImplControlValue(), OUString(),
aBoundingRegion, aBtn1Region ) &&
- GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_RIGHT,
+ GetNativeControlRegion( CTRL_SCROLLBAR, IsRTLEnabled()?
PART_BUTTON_LEFT: PART_BUTTON_RIGHT,
aControlRegion, 0, ImplControlValue(), OUString(),
aBoundingRegion, aBtn2Region ) )
{
maBtn1Rect = aBtn1Region;
commit 48e1d9c7afe5c2a39d9a08d7a38f7c8ff39d8c84
Author: Ivan Timofeev
Date: Mon Jun 24 22:55:55 2013 +0400
fdo#66335: gtk: Revert hacks for RTL scrollbars
returning false here in getNativeControlRegion results in a fallback to
square buttons in vcl scrollbar code. But there is no problem in gtk+
backend
in this case, let's fix the problem differently.
This reverts commits 898a3e84807bccbb876e3f5583728f6d24e05e9a and
e8e82bd2109b82ddd535cdac30303249c6b62942.
Change-Id: I66fcdd1f27d471321852445e5881cee03baef7b1
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 176486e..c88bc6f 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1048,13 +1048,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(
ControlType nType,
rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
if (!rNativeContentRegion.GetHeight())
rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
-//fdo#63254 horizontal scrool bar isn't displayed in RTL tab
-// with LTR UI in calc
-returnVal =Application::GetSettings().GetLayoutRTL();
-
-//See fdo#44582, Horizontal scrollbar in navigator window is broken
-if ((n
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/baside2.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 560b27613679d2a3b3ddb89c2afe481bcf2996e3
Author: Ivan Timofeev
Date: Fri Nov 8 12:52:51 2013 +0400
fdo#71306: fix printing from basic ide
regression from e13a3d566ecc34a46e037aca1b2d70e58501e422
Change-Id: I0d734e112038746aa48df669d4b82b644a95c220
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 7080371..0acfe05 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -910,7 +910,9 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter,
sal_Int32 nPrintPage )
sal_uInt16 nLines = aLine.getLength()/nCharspLine+1;
for ( sal_uInt16 nLine = 0; nLine < nLines; nLine++ )
{
-OUString aTmpLine = aLine.copy(nLine*nCharspLine, nCharspLine );
+sal_Int32 nBeginIndex = nLine*nCharspLine;
+sal_Int32 nCopyCount = std::min(nCharspLine,
aLine.getLength()-nBeginIndex);
+OUString aTmpLine = aLine.copy(nBeginIndex, nCopyCount);
aPos.Y() += nLineHeight;
if ( aPos.Y() > ( aPaperSz.Height() + Print::nTopMargin ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - basctl/source
basctl/source/basicide/baside2.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 028b550cce4b08b33c9970baf785b6e1bedb4da2
Author: Ivan Timofeev
Date: Fri Nov 8 12:52:51 2013 +0400
fdo#71306: fix printing from basic ide
regression from e13a3d566ecc34a46e037aca1b2d70e58501e422
Change-Id: I0d734e112038746aa48df669d4b82b644a95c220
(cherry picked from commit 560b27613679d2a3b3ddb89c2afe481bcf2996e3)
Reviewed-on: https://gerrit.libreoffice.org/6615
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 4eb1a924..95ae6e1 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -903,7 +903,9 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter,
sal_Int32 nPrintPage )
sal_uInt16 nLines = aLine.getLength()/nCharspLine+1;
for ( sal_uInt16 nLine = 0; nLine < nLines; nLine++ )
{
-OUString aTmpLine = aLine.copy(nLine*nCharspLine, nCharspLine );
+sal_Int32 nBeginIndex = nLine*nCharspLine;
+sal_Int32 nCopyCount = std::min(nCharspLine,
aLine.getLength()-nBeginIndex);
+OUString aTmpLine = aLine.copy(nBeginIndex, nCopyCount);
aPos.Y() += nLineHeight;
if ( aPos.Y() > ( aPaperSz.Height() + Print::nTopMargin ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - basctl/source
basctl/source/basicide/baside2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit abd333fc9ace9e559eef2c5dcb851ef9dceac553
Author: Ivan Timofeev
Date: Fri Nov 8 13:59:46 2013 +0400
fdo#71306: fix [Page: N] info in headers of pages printed from basic ide
Change-Id: I115503f0fca653343cfb1e0eb9dc81937ef82648
Reviewed-on: https://gerrit.libreoffice.org/6616
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 962658f..4eb1a924 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -135,7 +135,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages,
sal_uInt16 nCurPage,
if( bOutput )
{
-OUString aPageStr = " [" + IDE_RESSTR(RID_STR_PAGE) + " " +
OUString::valueOf( nCurPage ) + "]";
+OUString aPageStr = " [" + IDE_RESSTR(RID_STR_PAGE) + " " +
OUString::number( nCurPage ) + "]";
pPrinter->DrawText( aPos, aPageStr );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/ribbar/workctrl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit a645a14cf46a1160c426052823772ad117f0bd8b
Author: Ivan Timofeev
Date: Thu Jul 25 14:58:42 2013 +0400
Related: fdo#67113 restore some code, it has side effects
these lines were removed in 8275c8fc33b63aa40a0a8a8c215f32b9986edab6
fixes missing AutoText menu entries and AutoText insertion via menu
Change-Id: Ifa498d1cbfc096cca7751de9c9667fda6f1b3b48
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index b7d959c..384db99 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -207,6 +207,7 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
{
// Acquire group name with path extension
String sTitle;
+pGlossaryList->GetGroupName(i - 1, sal_False, &sTitle);
sal_uInt16 nBlockCount = pGlossaryList->GetBlockCount(i
-1);
if(nBlockCount)
{
@@ -303,6 +304,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
SwGlossaryList* pGlossaryList = ::GetGlossaryList();
String sShortName;
String sGroup = pGlossaryList->GetGroupName(nBlock - 1, false);
+pGlossaryList->GetBlockName(nBlock - 1, nId - (100 * nBlock) - 1,
sShortName);
SwGlossaryHdl* pGlosHdl = pView->GetGlosHdl();
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/ribbar/workctrl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit ab79f3def7ce98d27e096e6b40203787dde2f3fb
Author: Ivan Timofeev
Date: Thu Jul 25 14:58:42 2013 +0400
Related: fdo#67113 restore some code, it has side effects
these lines were removed in 8275c8fc33b63aa40a0a8a8c215f32b9986edab6
fixes missing AutoText menu entries and AutoText insertion via menu
Change-Id: Ifa498d1cbfc096cca7751de9c9667fda6f1b3b48
(cherry picked from commit a645a14cf46a1160c426052823772ad117f0bd8b)
Reviewed-on: https://gerrit.libreoffice.org/5111
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index b7d959c..384db99 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -207,6 +207,7 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
{
// Acquire group name with path extension
String sTitle;
+pGlossaryList->GetGroupName(i - 1, sal_False, &sTitle);
sal_uInt16 nBlockCount = pGlossaryList->GetBlockCount(i
-1);
if(nBlockCount)
{
@@ -303,6 +304,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
SwGlossaryList* pGlossaryList = ::GetGlossaryList();
String sShortName;
String sGroup = pGlossaryList->GetGroupName(nBlock - 1, false);
+pGlossaryList->GetBlockName(nBlock - 1, nId - (100 * nBlock) - 1,
sShortName);
SwGlossaryHdl* pGlosHdl = pView->GetGlosHdl();
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/source
sw/source/ui/dochdl/gloshdl.cxx | 10 ++--
sw/source/ui/inc/gloslst.hxx | 27 ++-
sw/source/ui/inc/workctrl.hxx|4 -
sw/source/ui/ribbar/workctrl.cxx | 39 +++-
sw/source/ui/shells/textglos.cxx | 12 ++---
sw/source/ui/utlui/gloslst.cxx | 93 ++-
6 files changed, 99 insertions(+), 86 deletions(-)
New commits:
commit 4a1c808b95c9a62f6ecf8ae3c20218ef85a9261e
Author: Ivan Timofeev
Date: Fri Jul 26 18:59:27 2013 +0400
String -> OUString
Change-Id: I244de2137f6a7b26f21de24ff9273c5c3672d12e
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index 1c7b231..be38a29 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -151,7 +151,7 @@ class SwScrollNaviPopup : public SfxPopupWindow
FixedInfo aInfoField;
ImageList aIList;
-String sQuickHelp[2 * NID_COUNT];
+OUStringsQuickHelp[2 * NID_COUNT];
voidApplyImageList();
@@ -179,7 +179,7 @@ class SwNaviImageButton : public ImageButton
{
SwScrollNaviPopup* pPopup;
Image aImage;
-String sQuickText;
+OUStringsQuickText;
SfxPopupWindow* pPopupWindow;
SfxPopupWindow* pFloatingWindow;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
m_xFrame;
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index c925aed..69cded2 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -467,13 +467,13 @@ SwScrollNaviPopup::SwScrollNaviPopup( sal_uInt16 nId,
const Reference< XFrame >&
for( i = 0; i < NID_COUNT; i++)
{
sal_uInt16 nNaviId = aNavigationInsertIds[i];
-String sText;
+OUString sText;
ToolBoxItemBits nTbxBits = 0;
if((NID_PREV != nNaviId) && (NID_NEXT != nNaviId))
{
// -2, there's no string for Next/Prev
sal_uInt16 nResStr = ST_TBL - 2 + nNaviId - NID_START;
-sText = String(SW_RES(nResStr));
+sText = SW_RESSTR(nResStr);
nTbxBits = TIB_CHECKABLE;
}
aToolBox.InsertItem(nNaviId, sText, nTbxBits);
@@ -487,7 +487,7 @@ SwScrollNaviPopup::SwScrollNaviPopup( sal_uInt16 nId, const
Reference< XFrame >&
// these are global strings
for( i = 0; i < 2 * NID_COUNT; i++)
{
-sQuickHelp[i] = String(SW_RES(STR_IMGBTN_START + i));
+sQuickHelp[i] = SW_RESSTR(STR_IMGBTN_START + i);
}
Size aImgSize = aIList.GetImageSize();
@@ -595,7 +595,7 @@ String SwScrollNaviPopup::GetQuickHelpText(sal_Bool bNext)
nResId += SwView::GetMoveType() - NID_START;
if(!bNext)
nResId += NID_COUNT;
-return String(SW_RES(nResId));
+return SW_RESSTR(nResId);
}
void SwNaviImageButton::Click()
@@ -660,7 +660,7 @@ SwNaviImageButton::SwNaviImageButton(
ImageButton(pParent, SW_RES(BTN_NAVI)),
pPopup(0),
aImage(SW_RES(IMG_BTN)),
-sQuickText(SW_RES(ST_QUICK)),
+sQuickText(SW_RESSTR(ST_QUICK)),
pPopupWindow(0),
pFloatingWindow(0),
m_xFrame( rFrame )
@@ -715,8 +715,7 @@ SwZoomBox_Impl::SwZoomBox_Impl(
{ 25, 50, 75, 100, 150, 200 };
for(sal_uInt16 i = 0; i < sizeof(aZoomValues)/sizeof(sal_uInt16); i++)
{
-String sEntry = OUString::number(aZoomValues[i]);
-sEntry += '%';
+OUString sEntry = OUString::number(aZoomValues[i]) + "%";
InsertEntry(sEntry);
}
}
@@ -728,8 +727,8 @@ voidSwZoomBox_Impl::Select()
{
if ( !IsTravelSelect() )
{
-String sEntry(comphelper::string::remove(GetText(), '%'));
-sal_uInt16 nZoom = (sal_uInt16)sEntry.ToInt32();
+OUString sEntry(comphelper::string::remove(GetText(), '%'));
+sal_uInt16 nZoom = (sal_uInt16)sEntry.toInt32();
if(nZoom < MINZOOM)
nZoom = MINZOOM;
if(nZoom > MAXZOOM)
@@ -831,8 +830,8 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16
/*nSID*/,
SwZoomBox_Impl* pBox = (SwZoomBox_Impl*)GetToolBox().GetItemWindow(
GetId() );
if(SFX_ITEM_AVAILABLE <= eState)
{
-String sZoom(OUString::number(((const
SfxUInt16Item*)pState)->GetValue()));
-sZoom += '%';
+OUString sZoom(OUString::number(((const
SfxUInt16Item*)pState)->GetValue()));
+sZoom += "%";
pBox->SetText(sZoom);
pBox->SaveValue();
}
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx
index b1dbb1c..89d02ed 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/ui/shells/textglos.cxx
@@ -63,11 +63,11 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
case FN_NEW_GLOSSARY:
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bitmapex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dd6518d42fce1416fa00f80a7b7dead113c37752
Author: Ivan Timofeev
Date: Sun Jul 28 20:41:27 2013 +0400
fdo#67397: don't bother to create BlendFrame for width == 1 or height == 1
... because:
1) frame painted as a line doesn't make sense to me anyway;
2) it leads to x = 1 or y = 1 in createBlendFrame, while the max value for
that
variable is "width (or height) - 1", i.e. 0.
Change-Id: I7437bce6681e42cb57458c012927cf5d6bfc154f
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index e123ac2..b7dbf75 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -1251,7 +1251,7 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame(
const long nW(rSize.Width());
const long nH(rSize.Height());
-if(nW && nH)
+if(nW > 1 && nH > 1)
{
sal_uInt8 aEraseTrans(0xff);
Bitmap aContent(rSize, 24);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source
vcl/source/gdi/bitmapex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c30fad2fcee46d98a9a2da4cf0c0470f5cc7f34e
Author: Ivan Timofeev
Date: Sun Jul 28 20:41:27 2013 +0400
fdo#67397: don't bother to create BlendFrame for width == 1 or height == 1
... because:
1) frame painted as a line doesn't make sense to me anyway;
2) it leads to x = 1 or y = 1 in createBlendFrame, while the max value for
that
variable is "width (or height) - 1", i.e. 0.
Change-Id: I7437bce6681e42cb57458c012927cf5d6bfc154f
(cherry picked from commit dd6518d42fce1416fa00f80a7b7dead113c37752)
Reviewed-on: https://gerrit.libreoffice.org/5154
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 094b7c7..f60c583 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -982,7 +982,7 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame(
const long nW(rSize.Width());
const long nH(rSize.Height());
-if(nW && nH)
+if(nW > 1 && nH > 1)
{
sal_uInt8 aEraseTrans(0xff);
Bitmap aContent(rSize, 24);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/tblafmt.hxx |2 +-
sw/source/core/doc/tblafmt.cxx |5 ++---
sw/source/ui/table/tautofmt.cxx |7 +++
3 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 2f527be5513159c0aebd93f356cbd2b1dc04b253
Author: Ivan Timofeev
Date: Mon Jul 29 21:43:59 2013 +0400
fdo#67467: fix crash when renaming table in AutoFormat dialog
this reverts 5031e17d4b11181be94448702b1026bd38e0b3c4 and uses
ptr_vector::release instead of ptr_vector::erase to prevent object deletion.
The use of "transfer" leads to "Assertion `(void*)&from != (void*)this'
failed".
Change-Id: I77467ce9e1d9dd4b833032ebbe920cbb34d36675
Reviewed-on: https://gerrit.libreoffice.org/5172
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 58b1f10..404aaf6 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -314,7 +314,7 @@ public:
SwTableAutoFmt & operator[](size_t i);
void InsertAutoFmt(size_t i, SwTableAutoFmt * pFmt);
void EraseAutoFmt(size_t i);
-void MoveAutoFmt(size_t target, size_t source);
+SwTableAutoFmt* ReleaseAutoFmt(size_t i);
sal_Bool Load();
sal_Bool Save() const;
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 80483b2..40a07be 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1051,10 +1051,9 @@ void SwTableAutoFmtTbl::EraseAutoFmt(size_t const i)
m_pImpl->m_AutoFormats.erase(m_pImpl->m_AutoFormats.begin() + i);
}
-void SwTableAutoFmtTbl::MoveAutoFmt(size_t const target, size_t source)
+SwTableAutoFmt* SwTableAutoFmtTbl::ReleaseAutoFmt(size_t const i)
{
-m_pImpl->m_AutoFormats.transfer(m_pImpl->m_AutoFormats.begin() + target,
-m_pImpl->m_AutoFormats.begin() + source, m_pImpl->m_AutoFormats);
+return m_pImpl->m_AutoFormats.release(m_pImpl->m_AutoFormats.begin() +
i).release();
}
SwTableAutoFmtTbl::~SwTableAutoFmtTbl()
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 4300b0d..2b4d1cf 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -409,19 +409,18 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
{
// no format with this name exists, so rename it
m_pLbFormat->RemoveEntry( nDfltStylePos + nIndex );
-SwTableAutoFmt* p = &(*pTableTbl)[ nIndex ];
+SwTableAutoFmt* p = pTableTbl->ReleaseAutoFmt( nIndex );
p->SetName( aFormatName );
// keep all arrays sorted!
for( n = 1; n < pTableTbl->size(); ++n )
-if ((n != nIndex) &&
-((*pTableTbl)[n].GetName() > aFormatName))
+if ((*pTableTbl)[n].GetName() > aFormatName)
{
break;
}
-pTableTbl->MoveAutoFmt(n, nIndex);
+pTableTbl->InsertAutoFmt( n, p );
m_pLbFormat->InsertEntry( aFormatName, nDfltStylePos + n );
m_pLbFormat->SelectEntryPos( nDfltStylePos + n );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/inc sw/source
sw/inc/tblafmt.hxx |2 +-
sw/source/core/doc/tblafmt.cxx |5 ++---
sw/source/ui/table/tautofmt.cxx |7 +++
3 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 75ad317118aeb4cd875127d3918e5c912f56fbca
Author: Ivan Timofeev
Date: Mon Jul 29 21:43:59 2013 +0400
fdo#67467: fix crash when renaming table in AutoFormat dialog
this reverts 5031e17d4b11181be94448702b1026bd38e0b3c4 and uses
ptr_vector::release instead of ptr_vector::erase to prevent object deletion.
The use of "transfer" leads to "Assertion `(void*)&from != (void*)this'
failed".
Change-Id: I77467ce9e1d9dd4b833032ebbe920cbb34d36675
Reviewed-on: https://gerrit.libreoffice.org/5172
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 2f527be5513159c0aebd93f356cbd2b1dc04b253)
Signed-off-by: Michael Stahl
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 7340427..abee1ec 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -314,7 +314,7 @@ public:
SwTableAutoFmt & operator[](size_t i);
void InsertAutoFmt(size_t i, SwTableAutoFmt * pFmt);
void EraseAutoFmt(size_t i);
-void MoveAutoFmt(size_t target, size_t source);
+SwTableAutoFmt* ReleaseAutoFmt(size_t i);
sal_Bool Load();
sal_Bool Save() const;
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 2031563..2586fe4 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1050,10 +1050,9 @@ void SwTableAutoFmtTbl::EraseAutoFmt(size_t const i)
m_pImpl->m_AutoFormats.erase(m_pImpl->m_AutoFormats.begin() + i);
}
-void SwTableAutoFmtTbl::MoveAutoFmt(size_t const target, size_t source)
+SwTableAutoFmt* SwTableAutoFmtTbl::ReleaseAutoFmt(size_t const i)
{
-m_pImpl->m_AutoFormats.transfer(m_pImpl->m_AutoFormats.begin() + target,
-m_pImpl->m_AutoFormats.begin() + source, m_pImpl->m_AutoFormats);
+return m_pImpl->m_AutoFormats.release(m_pImpl->m_AutoFormats.begin() +
i).release();
}
SwTableAutoFmtTbl::~SwTableAutoFmtTbl()
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index aa93c35..0fcb9c1 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -409,19 +409,18 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
{
// no format with this name exists, so rename it
m_pLbFormat->RemoveEntry( nDfltStylePos + nIndex );
-SwTableAutoFmt* p = &(*pTableTbl)[ nIndex ];
+SwTableAutoFmt* p = pTableTbl->ReleaseAutoFmt( nIndex );
p->SetName( aFormatName );
// keep all arrays sorted!
for( n = 1; n < pTableTbl->size(); ++n )
-if ((n != nIndex) &&
-((*pTableTbl)[n].GetName() > aFormatName))
+if ((*pTableTbl)[n].GetName() > aFormatName)
{
break;
}
-pTableTbl->MoveAutoFmt(n, nIndex);
+pTableTbl->InsertAutoFmt( n, p );
m_pLbFormat->InsertEntry( aFormatName, nDfltStylePos + n );
m_pLbFormat->SelectEntryPos( nDfltStylePos + n );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/inc sw/source
sw/inc/tblafmt.hxx |2 +-
sw/source/core/doc/tblafmt.cxx |5 ++---
sw/source/ui/table/tautofmt.cxx |7 +++
3 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit c7bab3002a967b39b1d7be06dfa20fca9fd9f837
Author: Ivan Timofeev
Date: Mon Jul 29 21:43:59 2013 +0400
fdo#67467: fix crash when renaming table in AutoFormat dialog
this reverts 5031e17d4b11181be94448702b1026bd38e0b3c4 and uses
ptr_vector::release instead of ptr_vector::erase to prevent object deletion.
The use of "transfer" leads to "Assertion `(void*)&from != (void*)this'
failed".
Change-Id: I77467ce9e1d9dd4b833032ebbe920cbb34d36675
Reviewed-on: https://gerrit.libreoffice.org/5172
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 2f527be5513159c0aebd93f356cbd2b1dc04b253)
Signed-off-by: Michael Stahl
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 029d444..bac0e22 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -314,7 +314,7 @@ public:
SwTableAutoFmt & operator[](size_t i);
void InsertAutoFmt(size_t i, SwTableAutoFmt * pFmt);
void EraseAutoFmt(size_t i);
-void MoveAutoFmt(size_t target, size_t source);
+SwTableAutoFmt* ReleaseAutoFmt(size_t i);
sal_Bool Load();
sal_Bool Save() const;
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index ea1630c..2dee485 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1048,10 +1048,9 @@ void SwTableAutoFmtTbl::EraseAutoFmt(size_t const i)
m_pImpl->m_AutoFormats.erase(m_pImpl->m_AutoFormats.begin() + i);
}
-void SwTableAutoFmtTbl::MoveAutoFmt(size_t const target, size_t source)
+SwTableAutoFmt* SwTableAutoFmtTbl::ReleaseAutoFmt(size_t const i)
{
-m_pImpl->m_AutoFormats.transfer(m_pImpl->m_AutoFormats.begin() + target,
-m_pImpl->m_AutoFormats.begin() + source, m_pImpl->m_AutoFormats);
+return m_pImpl->m_AutoFormats.release(m_pImpl->m_AutoFormats.begin() +
i).release();
}
SwTableAutoFmtTbl::~SwTableAutoFmtTbl()
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 8995ac0..4c5cc36 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -437,19 +437,18 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
{
// no format with this name exists, so rename it
m_pLbFormat->RemoveEntry( nDfltStylePos + nIndex );
-SwTableAutoFmt* p = &(*pTableTbl)[ nIndex ];
+SwTableAutoFmt* p = pTableTbl->ReleaseAutoFmt( nIndex );
p->SetName( aFormatName );
// keep all arrays sorted!
for( n = 1; n < pTableTbl->size(); ++n )
-if ((n != nIndex) &&
-((*pTableTbl)[n].GetName() > aFormatName))
+if ((*pTableTbl)[n].GetName() > aFormatName)
{
break;
}
-pTableTbl->MoveAutoFmt(n, nIndex);
+pTableTbl->InsertAutoFmt( n, p );
m_pLbFormat->InsertEntry( aFormatName, nDfltStylePos + n );
m_pLbFormat->SelectEntryPos( nDfltStylePos + n );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/glossary.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a0bbc768a5fac2c3d27cd70877961561fe7f0ffa
Author: Ivan Timofeev
Date: Thu Aug 8 10:46:25 2013 +0400
fdo#67817: GetParent returns a VclGrid instance after conversion to .ui
Change-Id: Ib37e2de784823fec209c195963d925748412c692
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index a163807..98af8b8 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -919,7 +919,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag(
eRet = SV_DRAGDROP_NONE;
else
{
-SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent();
+SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
SvTreeListEntry* pParent = GetParent(pEntry);
GroupUserData* pGroupData = (GroupUserData*)pParent->GetUserData();
@@ -967,7 +967,7 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvTreeListEntry*
pTarget,
sal_Bool bRet = sal_False;
if(pDestParent != pSrcParent)
{
-SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent();
+SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
SwWait aWait( *pDlg->pSh->GetView().GetDocShell(), sal_True );
GroupUserData* pGroupData = (GroupUserData*)pSrcParent->GetUserData();
@@ -1013,7 +1013,7 @@ sal_Bool SwGlTreeListBox::NotifyCopying(
SvTreeListEntry* pTarget,
sal_Bool bRet = sal_False;
if(pDestParent != pSrcParent)
{
-SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent();
+SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
SwWait aWait( *pDlg->pSh->GetView().GetDocShell(), sal_True );
GroupUserData* pGroupData = (GroupUserData*)pSrcParent->GetUserData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/misc/glossary.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9b82bd95224203f62cf8d26f2af9f915e85e
Author: Ivan Timofeev
Date: Thu Aug 8 10:46:25 2013 +0400
fdo#67817: GetParent returns a VclGrid instance after conversion to .ui
Change-Id: Ib37e2de784823fec209c195963d925748412c692
(cherry picked from commit a0bbc768a5fac2c3d27cd70877961561fe7f0ffa)
Reviewed-on: https://gerrit.libreoffice.org/5310
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 3494051..e39d6bf 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -919,7 +919,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag(
eRet = SV_DRAGDROP_NONE;
else
{
-SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent();
+SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
SvTreeListEntry* pParent = GetParent(pEntry);
GroupUserData* pGroupData = (GroupUserData*)pParent->GetUserData();
@@ -967,7 +967,7 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvTreeListEntry*
pTarget,
sal_Bool bRet = sal_False;
if(pDestParent != pSrcParent)
{
-SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent();
+SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
SwWait aWait( *pDlg->pSh->GetView().GetDocShell(), sal_True );
GroupUserData* pGroupData = (GroupUserData*)pSrcParent->GetUserData();
@@ -1013,7 +1013,7 @@ sal_Bool SwGlTreeListBox::NotifyCopying(
SvTreeListEntry* pTarget,
sal_Bool bRet = sal_False;
if(pDestParent != pSrcParent)
{
-SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent();
+SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
SwWait aWait( *pDlg->pSh->GetView().GetDocShell(), sal_True );
GroupUserData* pGroupData = (GroupUserData*)pSrcParent->GetUserData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdotext.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2a0dd33a384009dcc92238cec344c9b0e98cf25f
Author: Ivan Timofeev
Date: Thu Aug 8 18:44:57 2013 +0400
fdo#67871: Revert "coverity#705731 Resource leak"
... and delete pContourPolyPolygon instead. Otherwise there is a null
pointer
dereference.
This reverts commit e3258713793f03d6cf96c19ff4c5d15a0cd666f1.
Change-Id: Id9d8c514c786b42233a35a9ade55d0c05986fb08
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 4a5a646..64cdc5b 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -601,6 +601,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner&
rOutliner, Rectangle& rAncho
{
// Take line width into account.
// When doing the hit test, avoid this. (Performance!)
+pContourPolyPolygon = new basegfx::B2DPolyPolygon();
// test if shadow needs to be avoided for TakeContour()
const SfxItemSet& rSet = GetObjectItemSet();
@@ -636,6 +637,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner&
rOutliner, Rectangle& rAncho
}
rOutliner.SetPolygon(aXorPolyPolygon, pContourPolyPolygon);
+delete pContourPolyPolygon;
}
void SdrTextObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/svdraw/svdotext.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 3d1576aa02dd638c252e5993e52c7de7833f9e10
Author: Ivan Timofeev
Date: Thu Aug 8 18:44:57 2013 +0400
fdo#67871: Revert "coverity#705731 Resource leak"
... and delete pContourPolyPolygon instead. Otherwise there is a null
pointer
dereference.
This reverts commit e3258713793f03d6cf96c19ff4c5d15a0cd666f1.
Change-Id: Id9d8c514c786b42233a35a9ade55d0c05986fb08
(cherry picked from commit 2a0dd33a384009dcc92238cec344c9b0e98cf25f)
Reviewed-on: https://gerrit.libreoffice.org/5315
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 387a561..4c331c6 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -601,6 +601,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner&
rOutliner, Rectangle& rAncho
{
// Take line width into account.
// When doing the hit test, avoid this. (Performance!)
+pContourPolyPolygon = new basegfx::B2DPolyPolygon();
// test if shadow needs to be avoided for TakeContour()
const SfxItemSet& rSet = GetObjectItemSet();
@@ -636,6 +637,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner&
rOutliner, Rectangle& rAncho
}
rOutliner.SetPolygon(aXorPolyPolygon, pContourPolyPolygon);
+delete pContourPolyPolygon;
}
void SdrTextObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drawview.cxx | 36
1 file changed, 12 insertions(+), 24 deletions(-)
New commits:
commit c3140e23ff7a22e3b4126a2d12ee90dfdcd19ce2
Author: Ivan Timofeev
Date: Fri Aug 9 18:15:06 2013 +0400
String->OUString
Change-Id: Ia58a7df837621886e617727d80fce135365a8055
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 0a273fe..2ee5aa8 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -140,13 +140,11 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
{
SfxStyleSheetBasePool* pStShPool = mrDoc.GetStyleSheetPool();
SdPage& rPage = *mpDrawViewShell->getCurrentPage();
-String aLayoutName = rPage.GetName();
SdrTextObj* pEditObject = static_cast< SdrTextObj* >(
GetTextEditObject() );
if (pEditObject)
{
// Textedit
-String aTemplateName(aLayoutName);
sal_uInt32 nInv = pEditObject->GetObjInventor();
@@ -180,17 +178,13 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
OutlinerView* pOV = GetTextEditOutlinerView();
::Outliner* pOutliner = pOV->GetOutliner();
-aTemplateName += String(SdResId(STR_LAYOUT_OUTLINE));
-
pOutliner->SetUpdateMode(sal_False);
mpDocSh->SetWaitCursor( sal_True );
// replace placeholder by template name
-String aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
-xub_StrLen nPos = aComment.Search( (sal_Unicode)'$' );
-aComment.Erase(nPos, 1);
-aComment.Insert(
String((SdResId(STR_PSEUDOSHEET_OUTLINE))), nPos);
-mpDocSh->GetUndoManager()->EnterListAction( aComment,
String() );
+OUString aComment(SD_RESSTR(STR_UNDO_CHANGE_PRES_OBJECT));
+aComment = aComment.replaceFirst("$",
SD_RESSTR(STR_PSEUDOSHEET_OUTLINE));
+mpDocSh->GetUndoManager()->EnterListAction( aComment,
OUString() );
std::vector aSelList;
pOV->CreateSelectionList(aSelList);
@@ -202,9 +196,8 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
{
sal_Int32 nParaPos = pOutliner->GetAbsPos( pPara );
sal_Int16 nDepth = pOutliner->GetDepth( nParaPos );
-String aName(rPage.GetLayoutName());
-aName += (sal_Unicode)(' ');
-aName += OUString::number( (nDepth <= 0) ? 1 : nDepth
+ 1 );
+OUString aName = rPage.GetLayoutName() + " " +
+OUString::number((nDepth <= 0) ? 1 : nDepth + 1);
SfxStyleSheet* pSheet =
(SfxStyleSheet*)pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
DBG_ASSERT(pSheet, "StyleSheet not found");
@@ -229,9 +222,8 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
sal_Int16 nChild;
for( nChild = nDepth + 1; nChild < 9; nChild++ )
{
-String aSheetName(rPage.GetLayoutName());
-aSheetName += (sal_Unicode)(' ');
-aSheetName += OUString::number( nChild <= 0 ? 1 :
nChild + 1 );
+OUString aSheetName = rPage.GetLayoutName() + " " +
+OUString::number((nChild <= 0) ? 1 : nChild +
1);
SfxStyleSheet* pOutlSheet = static_cast<
SfxStyleSheet* >(pStShPool->Find(aSheetName, SD_STYLE_FAMILY_MASTERPAGE));
if( pOutlSheet )
@@ -273,7 +265,6 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
{
sal_uInt16 eObjKind = pObject->GetObjIdentifier();
PresObjKind ePresObjKind = rPage.GetPresObjKind(pObject);
-String aTemplateName(aLayoutName);
if (ePresObjKind == PRESOBJ_TITLE ||
ePresObjKind == PRESOBJ_NOTES)
@@ -297,12 +288,10 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
else if (eObjKind == OBJ_OUTLINETEXT)
{
// Presentation object outline
-aTemplateName += String(SdResId(STR_LAYOUT_OUTLINE));
for (sal_uInt16 nLevel = 9; nLevel > 0; nLevel--)
{
-String aName(rPage.GetLayoutName());
-
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/tabtempl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 38c1a22d50b3ff4102683f0fbd90a62574c2e08e
Author: Ivan Timofeev
Date: Sat Aug 10 14:40:33 2013 +0400
typo
Change-Id: Ib608d05fc76466f67f2172541f96ca77c571f341
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index 7077321..7078241 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -94,7 +94,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent,
m_nTabId = AddTabPage("tabs", RID_SVXPAGE_TABULATOR);
SvtCJKOptions aCJKOptions;
if( aCJKOptions.IsAsianTypographyEnabled() )
-m_nAsianTypoId = AddTabPage("asiantype", RID_SVXPAGE_PARA_ASIAN);
+m_nAsianTypoId = AddTabPage("asiantypo", RID_SVXPAGE_PARA_ASIAN);
else
RemoveTabPage("asiantypo");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/undolayer.cxx |4 +--
sd/source/ui/func/unprlout.cxx |6 ++---
sd/source/ui/inc/undolayer.hxx | 16 ++---
sd/source/ui/inc/unmodpg.hxx| 20 +
sd/source/ui/inc/unprlout.hxx | 10
sd/source/ui/view/unmodpg.cxx | 46 ++--
sd/source/ui/view/viewshe2.cxx |2 -
sd/source/ui/view/viewshe3.cxx | 14 ++--
sd/source/ui/view/viewshel.cxx |3 --
9 files changed, 59 insertions(+), 62 deletions(-)
New commits:
commit e1b8dfda24c75e91d8ebced7a4022b78ee7fca25
Author: Ivan Timofeev
Date: Sat Aug 10 16:30:45 2013 +0400
String->OUString
Change-Id: Ifda8c7453ecb40abdae8d63656b8742c80691b98
diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx
index 52868cc..5954a2c 100644
--- a/sd/source/ui/func/undolayer.cxx
+++ b/sd/source/ui/func/undolayer.cxx
@@ -30,8 +30,8 @@ TYPEINIT1(SdLayerModifyUndoAction, SdUndoAction);
SdLayerModifyUndoAction::SdLayerModifyUndoAction(
SdDrawDocument* _pDoc, SdrLayer* pLayer,
-const String& rOldLayerName, const String& rOldLayerTitle, const String&
rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
-const String& rNewLayerName, const String& rNewLayerTitle, const String&
rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable )
+const OUString& rOldLayerName, const OUString& rOldLayerTitle, const
OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool
bOldIsPrintable,
+const OUString& rNewLayerName, const OUString& rNewLayerTitle, const
OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool
bNewIsPrintable )
: SdUndoAction( _pDoc ),
mpLayer( pLayer ),
maOldLayerName( rOldLayerName ),
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index 35cb13b..1100fc6 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -30,8 +30,8 @@ TYPEINIT1(SdPresentationLayoutUndoAction, SdUndoAction);
SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
SdDrawDocument* pTheDoc,
-String aTheOldLayoutName,
-String aTheNewLayoutName,
+OUStringaTheOldLayoutName,
+OUStringaTheNewLayoutName,
AutoLayout eTheOldAutoLayout,
AutoLayout eTheNewAutoLayout,
sal_BoolbSet,
@@ -46,7 +46,7 @@
SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
DBG_ASSERT(pThePage, "No Page set!");
pPage = pThePage;
-aComment = String(SdResId(STR_UNDO_SET_PRESLAYOUT));
+aComment = SD_RESSTR(STR_UNDO_SET_PRESLAYOUT);
}
void SdPresentationLayoutUndoAction::Undo()
diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx
index b5802da..9e9f93a 100644
--- a/sd/source/ui/inc/undolayer.hxx
+++ b/sd/source/ui/inc/undolayer.hxx
@@ -33,23 +33,23 @@ class SdLayerModifyUndoAction : public SdUndoAction
public:
TYPEINFO();
SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer,
-const String& rOldLayerName, const String& rOldLayerTitle, const String&
rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
-const String& rNewLayerName, const String& rNewLayerTitle, const String&
rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable );
+const OUString& rOldLayerName, const OUString& rOldLayerTitle, const
OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool
bOldIsPrintable,
+const OUString& rNewLayerName, const OUString& rNewLayerTitle, const
OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool
bNewIsPrintable );
virtual void Undo();
virtual void Redo();
private:
SdrLayer* mpLayer;
-String maOldLayerName;
-String maOldLayerTitle;
-String maOldLayerDesc;
+OUString maOldLayerName;
+OUString maOldLayerTitle;
+OUString maOldLayerDesc;
bool mbOldIsVisible;
bool mbOldIsLocked;
bool mbOldIsPrintable;
-String maNewLayerName;
-String maNewLayerTitle;
-String maNewLayerDesc;
+OUString maNewLayerName;
+OUString maNewLayerTitle;
+OUString maNewLayerDesc;
bool mbNewIsVisible;
bool mbNewIsLocked;
bool mbNewIsPrintable;
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index 44b942e..bd48758 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -29,8 +29,8 @@ class SdPage;
class ModifyPageUndoAction : public SdUndoAction
{
SdPage* mpPage;
-String maOldName;
-String maNewName;
+OUS
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/DocumentRenderer.cxx| 49 +---
sd/source/ui/view/GraphicObjectBar.cxx|6 -
sd/source/ui/view/MediaObjectBar.cxx |2
sd/source/ui/view/Outliner.cxx| 25 +++---
sd/source/ui/view/ViewClipboard.cxx | 14 +--
sd/source/ui/view/ViewShellBase.cxx |2
sd/source/ui/view/ViewShellImplementation.cxx | 14 +--
sd/source/ui/view/drbezob.cxx |2
sd/source/ui/view/drtxtob.cxx |2
sd/source/ui/view/drtxtob1.cxx|4 -
sd/source/ui/view/drviews1.cxx| 32
sd/source/ui/view/drviews2.cxx| 100 --
12 files changed, 122 insertions(+), 130 deletions(-)
New commits:
commit d4ba5995a168a8999734252fe6e9240bde1b7dae
Author: Ivan Timofeev
Date: Sat Aug 10 21:37:06 2013 +0400
String->OUString
Change-Id: Ic908590642bac656db78a965c2176d6f53c8d6f4
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index a277534..51b0a45 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -194,10 +194,7 @@ namespace {
OUString GetPrinterSelection (sal_Int32 nPageCount, sal_Int32
nCurrentPageIndex) const
{
sal_Int32 nContent =
static_cast(mrProperties.getIntValue( "PrintContent", 0 ));
-OUString sFullRange = OUStringBuffer()
- .append(static_cast(1))
- .append(static_cast('-'))
- .append(nPageCount).makeStringAndClear();
+OUString sFullRange = "1-" + OUString::number(nPageCount);
if (nContent == 0) // all pages/slides
{
@@ -404,9 +401,9 @@ namespace {
maProperties.push_back(aOptionsUIFile);
SvtModuleOptions aOpt;
-String aAppGroupname( String( SdResId(
_STR_IMPRESS_PRINT_UI_GROUP_NAME ) ) );
-aAppGroupname.SearchAndReplace( String( "%s" ),
- aOpt.GetModuleName( mbImpress ?
SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) );
+OUString
aAppGroupname(SD_RESSTR(_STR_IMPRESS_PRINT_UI_GROUP_NAME));
+aAppGroupname = aAppGroupname.replaceFirst("%s",
aOpt.GetModuleName(
+mbImpress ? SvtModuleOptions::E_SIMPRESS :
SvtModuleOptions::E_SDRAW));
AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2",
aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"));
uno::Sequence< OUString > aHelpIds, aWidgetIds;
@@ -415,7 +412,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt;
aPrintOpt.maGroupHint = "JobPage" ;
AddDialogControl(
vcl::PrinterOptionsHelper::setSubgroupControlOpt("extraimpressprintoptions",
-String(
SdResId(_STR_IMPRESS_PRINT_UI_PRINT_GROUP) ),
+
SD_RESSTR(_STR_IMPRESS_PRINT_UI_PRINT_GROUP),
"",
aPrintOpt ));
@@ -423,7 +420,7 @@ namespace {
aHelpIds[0] =
".HelpID:vcl:PrintDialog:PageContentType:ListBox" ;
AddDialogControl(
vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"impressdocument",
-String( SdResId(
_STR_IMPRESS_PRINT_UI_CONTENT ) ),
+SD_RESSTR(_STR_IMPRESS_PRINT_UI_CONTENT),
aHelpIds,
"PageContentType" ,
CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_CHOICES),
@@ -434,7 +431,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aContentOpt(
"PageContentType" , 1 );
AddDialogControl(
vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"slidesperpage",
-String( SdResId(
_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE ) ),
+
SD_RESSTR(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE),
aHelpIds,
"SlidesPerPage" ,
GetSlidesPerPageSequence(),
@@ -448,7 +445,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt(
"SlidesPerPage" , -1, sal_True );
AddDialogControl(
vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"slidesperpageorder",
-
[Libreoffice-commits] core.git: basctl/source cui/source include/sfx2 sc/source sd/source sfx2/source sw/source
basctl/source/basicide/basides2.cxx |4 ++--
basctl/source/inc/basidesh.hxx|2 +-
cui/source/tabpages/autocdlg.cxx |4 ++--
include/sfx2/viewsh.hxx |2 +-
sc/source/ui/inc/editsh.hxx |2 +-
sc/source/ui/inc/tabvwsh.hxx |2 +-
sc/source/ui/view/editsh.cxx |4 ++--
sc/source/ui/view/tabvwshe.cxx| 12
sd/source/ui/inc/DrawViewShell.hxx|2 +-
sd/source/ui/inc/OutlineViewShell.hxx |2 +-
sd/source/ui/inc/ViewShellBase.hxx|2 +-
sd/source/ui/view/ViewShellBase.cxx |2 +-
sd/source/ui/view/drviewsf.cxx|2 +-
sd/source/ui/view/outlnvsh.cxx|2 +-
sfx2/source/view/viewsh.cxx |6 +++---
sw/source/ui/inc/view.hxx |6 +++---
sw/source/ui/index/swuiidxmrk.cxx |4 ++--
sw/source/ui/uiview/view.cxx |7 +++
18 files changed, 31 insertions(+), 36 deletions(-)
New commits:
commit dcbad1b3bfe719f4eecdfafe8c78dd01f34b6605
Author: Ivan Timofeev
Date: Tue Aug 13 23:01:07 2013 +0400
convert GetSelectionText... methods to OUString and bool
Change-Id: I77726f009338ae49877c5f58fe6c14d386089bbe
diff --git a/basctl/source/basicide/basides2.cxx
b/basctl/source/basicide/basides2.cxx
index 8e1daa8..052486c 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -63,9 +63,9 @@ sal_Bool Shell::HasSelection( sal_Bool /* bText */ ) const
return false;
}
-String Shell::GetSelectionText( sal_Bool bWholeWord )
+OUString Shell::GetSelectionText( bool bWholeWord )
{
-String aText;
+OUString aText;
if (ModulWindow* pMCurWin = dynamic_cast(pCurWin))
{
if (TextView* pEditView = pMCurWin->GetEditView())
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index b16f535..1945d8a 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -179,7 +179,7 @@ public:
// virtual sal_uInt16 Print( SfxProgress &rProgress, sal_Bool
bIsAPI, PrintDialog *pPrintDialog = 0 );
virtual SfxPrinter* GetPrinter( sal_Bool bCreate );
virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16
nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
-virtual String GetSelectionText( sal_Bool bCompleteWords );
+virtual OUStringGetSelectionText( bool bCompleteWords );
virtual sal_BoolHasSelection( sal_Bool bText ) const;
voidGetState( SfxItemSet& );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 2b57b6c..014b889 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1032,10 +1032,10 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool
bFromReset,
if( pViewShell && pViewShell->HasSelection( sal_True ) )
{
bHasSelectionText = sal_True;
-const String sSelection( pViewShell->GetSelectionText() );
+const OUString sSelection( pViewShell->GetSelectionText() );
m_pReplaceED->SetText( sSelection );
m_pTextOnlyCB->Check( !bSWriter );
-m_pTextOnlyCB->Enable( bSWriter && sSelection.Len() );
+m_pTextOnlyCB->Enable( bSWriter && !sSelection.isEmpty() );
}
else
{
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index ad4c64c..b09708e 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -185,7 +185,7 @@ public:
// Misc
virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True,
sal_Bool bForBrowsing = sal_False );
-virtual String GetSelectionText( sal_Bool bCompleteWords =
sal_False );
+virtual OUStringGetSelectionText( bool bCompleteWords = false
);
virtual sal_BoolHasSelection( sal_Bool bText = sal_True )
const;
virtual SdrView*GetDrawView() const;
diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx
index f888bbc..1f84d27 100644
--- a/sc/source/ui/inc/editsh.hxx
+++ b/sc/source/ui/inc/editsh.hxx
@@ -69,7 +69,7 @@ public:
voidExecuteUndo(SfxRequest& rReq);
voidGetUndoState(SfxItemSet &rSet);
-String GetSelectionText( sal_Bool bWholeWord );
+OUString GetSelectionText( bool bWholeWord );
};
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 06cd9c8..a5da444 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -213,7 +213,7 @@ protected:
virtual voidQueryObjAreaPixel( Rectangle& rRect ) const;
-virtual String GetSelectionText( sal_Bool bWholeWord );
+virtual OUString GetSelectionText( bool bWholeWord );
virtual sal_BoolHasSelection( sal_Bool bText ) const;
virtual String GetDescription() const;
diff --git a/sc/source/ui/view/editsh.cxx b/sc/sou
[Libreoffice-commits] core.git: include/sfx2 sc/source sd/source sfx2/source sw/inc sw/source
include/sfx2/viewsh.hxx|4 - sc/source/ui/inc/prevwsh.hxx |4 - sc/source/ui/inc/tabvwsh.hxx |4 - sc/source/ui/inc/viewdata.hxx |4 - sc/source/ui/view/prevwsh.cxx | 13 +-- sc/source/ui/view/tabvwsh4.cxx |4 - sc/source/ui/view/viewdata.cxx | 62 -- sd/source/ui/inc/ViewShell.hxx |4 - sd/source/ui/inc/ViewShellBase.hxx |4 - sd/source/ui/view/ViewShellBase.cxx|4 - sd/source/ui/view/viewshe2.cxx |4 - sfx2/source/view/sfxbasecontroller.cxx |5 - sfx2/source/view/viewsh.cxx|4 - sw/inc/shellio.hxx |4 - sw/source/filter/basflt/fltini.cxx | 111 - sw/source/ui/dbui/mmoutputpage.cxx |4 - sw/source/ui/dialog/ascfldlg.cxx |4 - sw/source/ui/inc/pview.hxx |6 - sw/source/ui/inc/view.hxx |4 - sw/source/ui/uiview/pview.cxx |2 sw/source/ui/uiview/view.cxx | 42 ++-- sw/source/ui/uiview/view1.cxx |2 sw/source/ui/uno/SwXFilterOptions.cxx |4 - 23 files changed, 148 insertions(+), 155 deletions(-) New commits: commit dde3a753cead04915259d3fde0e913096f1a3922 Author: Ivan Timofeev Date: Wed Aug 14 18:41:28 2013 +0400 convert Read/WriteUserData methods to OUString and bool Change-Id: I06a8158b7f503976b19383014a7c8a867c0184ea diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index b09708e..9b5f0bc 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -219,8 +219,8 @@ public: Printer*GetActivePrinter() const; // Working set -virtual voidWriteUserData( String&, sal_Bool bBrowse = sal_False ); -virtual voidReadUserData( const String&, sal_Bool bBrowse = sal_False ); +virtual voidWriteUserData( OUString&, bool bBrowse = false ); +virtual voidReadUserData( const OUString&, bool bBrowse = false ); virtual voidWriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual voidReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual voidQueryObjAreaPixel( Rectangle& rRect ) const; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 8a49100..c358280 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -73,8 +73,8 @@ protected: virtual String GetDescription() const; -virtual voidWriteUserData(String &, sal_Bool bBrowse = false); -virtual voidReadUserData(const String &, sal_Bool bBrowse = false); +virtual voidWriteUserData(OUString &, bool bBrowse = false); +virtual voidReadUserData(const OUString &, bool bBrowse = false); virtual voidWriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = false ); virtual voidReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = false ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index a5da444..9ca90c8 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -217,8 +217,8 @@ protected: virtual sal_BoolHasSelection( sal_Bool bText ) const; virtual String GetDescription() const; -virtual voidWriteUserData(String &, sal_Bool bBrowse = false); -virtual voidReadUserData(const String &, sal_Bool bBrowse = false); +virtual voidWriteUserData(OUString &, bool bBrowse = false); +virtual voidReadUserData(const OUString &, bool bBrowse = false); virtual voidWriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = false ); virtual voidReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = false ); diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 2ea9689..ca90f3e 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -252,8 +252,8 @@ public: voidUpdateInputHandler( sal_Bool bForce = false, sal_Bool bStopEditing = sal_True ); -voidWriteUserData(String& rData); -voidReadUserData(const String& rData); +voidWriteUserData(OUString& rData); +voidReadUserData(const OUString& rData); void
[Libreoffice-commits] core.git: chart2/source cui/source include/svx sc/source sd/source sw/source
chart2/source/controller/main/ShapeController.cxx | 12 +--
cui/source/customize/cfg.cxx | 10 +-
cui/source/dialogs/hangulhanjadlg.cxx |4 -
cui/source/factory/dlgfact.cxx |8 +-
cui/source/factory/dlgfact.hxx |8 +-
cui/source/inc/dlgname.hxx |8 +-
cui/source/inc/hangulhanjadlg.hxx |2
cui/source/options/optcolor.cxx|6 -
cui/source/tabpages/tpbitmap.cxx | 10 +-
cui/source/tabpages/tpcolor.cxx|4 -
cui/source/tabpages/tpgradnt.cxx |8 +-
cui/source/tabpages/tphatch.cxx|8 +-
cui/source/tabpages/tplnedef.cxx |8 +-
cui/source/tabpages/tplneend.cxx |6 -
include/svx/svxdlg.hxx |8 +-
sc/source/ui/drawfunc/drawsh5.cxx | 12 +--
sd/source/ui/docshell/docshel2.cxx | 60 -
sd/source/ui/func/fulinend.cxx |6 -
sd/source/ui/inc/DrawDocShell.hxx |4 -
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |8 +-
sd/source/ui/view/drviews2.cxx | 10 +-
sd/source/ui/view/drviewsb.cxx |4 -
sd/source/ui/view/drviewsc.cxx |4 -
sd/source/ui/view/sdview2.cxx |2
sd/source/ui/view/tabcontr.cxx |2
sw/source/ui/shells/drwbassh.cxx | 10 +-
sw/source/ui/shells/frmsh.cxx |4 -
27 files changed, 115 insertions(+), 121 deletions(-)
New commits:
commit 1edb495a45fde1d788b409fd1a9a839bd370c426
Author: Ivan Timofeev
Date: Thu Aug 15 16:56:09 2013 +0400
convert GetName/Title/Description methods to OUString
Change-Id: Id16a2b29b1d6cf02b94cc6c423e2475a9cbeb8a3
diff --git a/chart2/source/controller/main/ShapeController.cxx
b/chart2/source/controller/main/ShapeController.cxx
index 9991774..24c32c1 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -231,12 +231,12 @@ void ShapeController::describeSupportedFeatures()
IMPL_LINK( ShapeController, CheckNameHdl, AbstractSvxNameDialog*, pDialog )
{
-String aName;
+OUString aName;
if ( pDialog )
{
pDialog->GetName( aName );
}
-if ( aName.Len() )
+if ( !aName.isEmpty() )
{
DrawViewWrapper* pDrawViewWrapper = ( m_pChartController ?
m_pChartController->GetDrawViewWrapper() : NULL );
if ( pDrawViewWrapper && pDrawViewWrapper->getNamedSdrObject( aName ) )
@@ -436,8 +436,8 @@ void
ShapeController::executeDispatch_ObjectTitleDescription()
SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject();
if ( pSelectedObj )
{
-String aTitle( pSelectedObj->GetTitle() );
-String aDescription( pSelectedObj->GetDescription() );
+OUString aTitle( pSelectedObj->GetTitle() );
+OUString aDescription( pSelectedObj->GetDescription() );
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
if ( pFact )
{
@@ -476,9 +476,7 @@ void ShapeController::executeDispatch_RenameObject()
pDlg->SetCheckNameHdl( LINK( this, ShapeController,
CheckNameHdl ) );
if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
{
-String aTmp;
-pDlg->GetName(aTmp);
-aName = aTmp;
+pDlg->GetName(aName);
if (pSelectedObj->GetName().equals(aName))
{
pSelectedObj->SetName( aName );
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 8cf9483..7e1d9a3 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2535,7 +2535,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton
*, pButton )
{
SvxConfigEntry* pMenuData = GetTopLevelSelection();
-String aNewName( stripHotKey( pMenuData->GetName() ) );
+OUString aNewName( stripHotKey( pMenuData->GetName() ) );
String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName,
aDesc );
@@ -2593,7 +2593,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton
*, pButton )
{
case ID_ADD_SUBMENU:
{
-String aNewName;
+OUString aNewName;
[Libreoffice-commits] core.git: 2 commits - sd/source sw/source
sd/source/ui/accessibility/AccessibleOutlineView.cxx |4
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx |4
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |4
sd/source/ui/animations/CustomAnimationCreateDialog.cxx|2
sd/source/ui/animations/CustomAnimationDialog.cxx | 48 +++-
sd/source/ui/animations/CustomAnimationList.cxx|4
sd/source/ui/animations/CustomAnimationPane.cxx| 53 -
sd/source/ui/animations/CustomAnimationPane.hxx|4
sd/source/ui/animations/SlideTransitionPane.cxx| 72 +
sd/source/ui/animations/SlideTransitionPane.hxx|6 -
sw/source/ui/docvw/HeaderFooterWin.cxx |4
11 files changed, 91 insertions(+), 114 deletions(-)
New commits:
commit 1f7d320eae75f7d96846f117f7b061ab6a5a84b1
Author: Ivan Timofeev
Date: Fri Aug 16 12:07:52 2013 +0400
String->OUString
Change-Id: I082aaa9ddd539a9d7989f763c320343bd1951f4e
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 5074eaf..39fc2d8 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -245,7 +245,7 @@ OUString
{
SolarMutexGuard aGuard;
-return String( SdResId(SID_SD_A11Y_I_OUTLINEVIEW_N) );
+return SD_RESSTR(SID_SD_A11Y_I_OUTLINEVIEW_N);
}
@@ -258,7 +258,7 @@ OUString
{
SolarMutexGuard aGuard;
-return String( SdResId(SID_SD_A11Y_I_OUTLINEVIEW_D) );
+return SD_RESSTR(SID_SD_A11Y_I_OUTLINEVIEW_D);
}
void AccessibleOutlineView::UpdateChildren()
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 9366bd1..c5177c1 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -203,7 +203,7 @@ OUString SAL_CALL
AccessibleSlideSorterObject::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
ThrowIfDisposed();
-return String(SdResId(STR_PAGE));
+return SD_RESSTR(STR_PAGE);
}
@@ -219,7 +219,7 @@ OUString SAL_CALL
AccessibleSlideSorterObject::getAccessibleName (void)
if (pPage != NULL)
return pPage->GetName();
else
-return String();
+return OUString();
}
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index ba31c04..e682668 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -294,7 +294,7 @@ OUString SAL_CALL
AccessibleSlideSorterView::getAccessibleDescription (void)
ThrowIfDisposed();
SolarMutexGuard aGuard;
-return String(SdResId(SID_SD_A11Y_I_SLIDEVIEW_D));
+return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_D);
}
@@ -306,7 +306,7 @@ OUString SAL_CALL
AccessibleSlideSorterView::getAccessibleName (void)
ThrowIfDisposed();
SolarMutexGuard aGuard;
-return String(SdResId(SID_SD_A11Y_I_SLIDEVIEW_N));
+return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_N);
}
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 813ff4e..95454ad 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -252,7 +252,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage(
Window* pParent, Cus
fillDurationComboBox(mpCBSpeed);
-String sMotionPathLabel( SdResId( STR_CUSTOMANIMATION_USERPATH ) );
+OUString sMotionPathLabel( SD_RESSTR( STR_CUSTOMANIMATION_USERPATH ) );
sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 058a072..691ec3a 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -566,8 +566,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32
nControlType, Window
mpMenu = new PopupMenu();
for( sal_Int32 i = 25; i < 101; i += 25 )
{
-String aStr(OUString::valueOf(i));
-aStr += sal_Unicode('%');
+OUString aStr(OUString::number(i) + "%");
mpMenu->InsertItem( i, aStr );
}
@@ -1004,7 +1003,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32
nControlType, Window* pPar
, maModifyHdl( rModifyHdl )
{
mpEdit = new Edit( pParent,
WB_TABSTOP|WB_IGNORETAB|WB_NOBORDER|WB_READONLY);
-mpEdit->SetText( String( SdResId( STR_CUSTOMANIMATION_SAMPLE ) ) );
+mpEdit->SetText( SD_RESSTR(STR_CUSTOMANIMATION_SAMPLE) );
mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATI
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/dlgass.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit af5c477748057903320df8a3df9901c91f820f2b
Author: Ivan Timofeev
Date: Fri Aug 16 23:35:26 2013 +0400
WaE: unused variable 'aFile'
Change-Id: I87486de9af7fee8d06cc97fb104de2e2a978de45
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 3bedd26..892d64e 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1006,7 +1006,6 @@ OUString AssistentDlgImpl::GetDocFileName()
OUString AssistentDlgImpl::GetLayoutFileName()
{
-OUString aFile;
const sal_uInt16 nEntry = mpPage2LayoutLB->GetSelectEntryPos();
TemplateEntry* pEntry = NULL;
if(nEntry != (sal_uInt16)-1 && nEntry > 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/charmap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b12e0b522b7f13d15d2ce41dc1e7c0159d53
Author: Ivan Timofeev
Date: Sat Aug 17 00:33:57 2013 +0400
fdo#68186: prevent integer underflow
since commit eb1ecd8bc2936e28be852722d6cb0c9fb0baeac4 the Basic Latin subset
starts at 0, previously it started at 0x20.
Change-Id: I2fe0ee66438b8f11775b1bb8feab547b564622f0
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index c68b392..4f1cbf6 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -650,7 +650,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool
bFocus )
void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus )
{
// get next available char of current font
-sal_UCS4 cNext = maFontCharMap.GetNextChar( cNew - 1 );
+sal_UCS4 cNext = maFontCharMap.GetNextChar( (cNew > 0) ? cNew - 1 : cNew );
int nMapIndex = maFontCharMap.GetIndexFromChar( cNext );
SelectIndex( nMapIndex, bFocus );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/dialog/charmap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f5475f4f85bc6cae51cbd4424dcc7a35cc2ef2dc
Author: Ivan Timofeev
Date: Sat Aug 17 00:33:57 2013 +0400
fdo#68186: prevent integer underflow
since commit eb1ecd8bc2936e28be852722d6cb0c9fb0baeac4 the Basic Latin subset
starts at 0, previously it started at 0x20.
Change-Id: I2fe0ee66438b8f11775b1bb8feab547b564622f0
(cherry picked from commit b12e0b522b7f13d15d2ce41dc1e7c0159d53)
Reviewed-on: https://gerrit.libreoffice.org/5469
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 23494a8..82239d8 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -650,7 +650,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool
bFocus )
void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus )
{
// get next available char of current font
-sal_UCS4 cNext = maFontCharMap.GetNextChar( cNew - 1 );
+sal_UCS4 cNext = maFontCharMap.GetNextChar( (cNew > 0) ? cNew - 1 : cNew );
int nMapIndex = maFontCharMap.GetIndexFromChar( cNext );
SelectIndex( nMapIndex, bFocus );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/filter/html/svxcss1.cxx |2 +-
sw/source/filter/html/swhtml.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6e84be040be7d3ec214c2b19462cafcc3f4b277e
Author: Ivan Timofeev
Date: Sat Aug 17 13:20:32 2013 +0400
fix copypasta
Change-Id: I92f2203988c5a4843ce512029ec60750fe4d25ff
diff --git a/sw/source/filter/html/svxcss1.cxx
b/sw/source/filter/html/svxcss1.cxx
index 14d881d..e04ccbd 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -185,7 +185,7 @@ static CSS1PropertyEnum const aBorderStyleTable[] =
{ "groove", CSS1_BS_GROOVE },
{ "ridge", CSS1_BS_RIDGE },
{ "inset", CSS1_BS_INSET },
-{ "inset", CSS1_BS_OUTSET },
+{ "outset", CSS1_BS_OUTSET },
{ 0,0 }
};
commit befc3e457df9daa7955752bb30cbad632da913de
Author: Ivan Timofeev
Date: Sat Aug 17 12:56:49 2013 +0400
fix string conversion
before commit 7a504c8752bf7c5accbb9bcc33a98f79b31b8bf2 there was:
aUnknownToken.CompareTo(sSaveToken) != COMPARE_EQUAL
Change-Id: I4c6411777f342e160c78b0ec591456e284e4e385
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 87fc2c2..1f88229 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1225,7 +1225,7 @@ void SwHTMLParser::NextToken( int nToken )
switch( nToken )
{
case HTML_UNKNOWNCONTROL_OFF:
-if( aUnknownToken.startsWith(sSaveToken) )
+if( aUnknownToken != sSaveToken )
return;
case HTML_FRAMESET_ON:
case HTML_HEAD_OFF:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/docvw/HeaderFooterWin.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 4fae4a48726462f1eb548a0afb244d8c7f93dd7e Author: Ivan Timofeev Date: Sat Aug 17 21:30:50 2013 +0400 aTextRect is unused Change-Id: I1653140533a0f848dcf577ad7e81991a4591d916 diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 20170cf..7da710c 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -284,9 +284,6 @@ void SwHeaderFooterWin::Paint( const Rectangle& ) FontAttribute aFontAttr = drawinglayer::primitive2d::getFontAttributeFromVclFont( aFontSize, GetFont(), false, false ); -Rectangle aTextRect; -GetTextBoundRect( aTextRect, String( m_sLabel ) ); - FontMetric aFontMetric = GetFontMetric( GetFont() ); double nTextOffsetY = aFontMetric.GetAscent() + TEXT_PADDING; Point aTextPos( TEXT_PADDING, nTextOffsetY ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/optgenrl.cxx | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit ca538f48e866b4eb69b498786d9030639cfe2ebd
Author: Ivan Timofeev
Date: Sun Aug 18 21:43:52 2013 +0400
fix updating of initials for the Russians
i.e. replace hardcoded "2" by nInits var. For the Russians nInits == 3.
Also move the code block to the more appropriate place.
Change-Id: I1cbc6b14dc5e4c04516c0d3952920ee060c81afc
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index a3f25e0..5dacdf6 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -361,17 +361,16 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *,
pEdit )
{
if (vFields[rNameRow.nFirstField + i]->pEdit == pEdit)
nField = i;
- // Since middle names are not supported, clear shortname if it
- // contains a middle initial
-if (OUString(rShortName.pEdit->GetText()).getLength() > 2)
- {
-rShortName.pEdit->SetText(OUString());
- }
}
// updating the initial
if (nField < nInits && rShortName.pEdit->IsEnabled())
{
OUString sShortName = rShortName.pEdit->GetText();
+// clear short name if it contains more characters than the number of
initials
+if ((unsigned)sShortName.getLength() > nInits)
+{
+rShortName.pEdit->SetText(OUString());
+}
while ((unsigned)sShortName.getLength() < nInits)
sShortName += OUString(' ');
OUString sName = pEdit->GetText();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 33b631c483e017e9ba9430034eb659f085093944 Author: Ivan Timofeev Date: Sun Aug 18 19:26:04 2013 +0400 fdo#67653: Revert "go back to 8 colorvalueset columns" This reverts commit 7e7ccea7cc91e86d7d345b85940dba16bec36fc4. Change-Id: Idc09233ccd53a7368da978bb7c1a04a640118e62 Reviewed-on: https://gerrit.libreoffice.org/5503 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index c1e96a1..ac9ed45 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6262,7 +6262,7 @@ Defines the number of columns that will be shown in a ColorValueSet. -8 +12 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 6ea3aa6aae980156529d007a107373bbd37dcee6
Author: Ivan Timofeev
Date: Tue Aug 20 17:51:58 2013 +0400
gtk: use frame widget for frame rendering
otherwise I get ugly two-color frames with the Adwaita theme.
Change-Id: Ibac1df9759148f89954e13051e3d6e64db30a2af
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index e3bff2a..a80112d 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1187,7 +1187,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(
ControlType nType,
}
if( nType == CTRL_FRAME && nPart == PART_BORDER )
{
-int frameWidth = getFrameWidth(m_pWindow);
+int frameWidth = getFrameWidth(gWidgetData[m_nXScreen].gFrame);
rNativeBoundingRegion = rControlRegion;
sal_uInt16 nStyle = aValue.getNumericVal();
int x1=rControlRegion.Left();
@@ -1308,7 +1308,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKFrame(
const OUString& )
{
GdkRectangle clipRect;
-int frameWidth=getFrameWidth(m_pWindow);
+int frameWidth=getFrameWidth(gWidgetData[m_nXScreen].gFrame);
GtkShadowType shadowType=GTK_SHADOW_IN;
sal_uInt16 nStyle = aValue.getNumericVal();
if( nStyle & FRAME_DRAW_IN )
@@ -1355,8 +1355,8 @@ sal_Bool GtkSalGraphics::NWPaintGTKFrame(
rControlRectangle.GetHeight());
// Now render the frame
-
gtk_paint_shadow(m_pWindow->style,gdkDrawable,GTK_STATE_NORMAL,shadowType,&clipRect,
- m_pWindow,"base",
+
gtk_paint_shadow(gWidgetData[m_nXScreen].gFrame->style,gdkDrawable,GTK_STATE_NORMAL,shadowType,&clipRect,
+ gWidgetData[m_nXScreen].gFrame,"base",
rControlRectangle.Left(),
rControlRectangle.Top(),
rControlRectangle.GetWidth(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/sdabstdlg.hxx |6 ++---
sd/source/ui/dlg/dlgassim.cxx| 10
sd/source/ui/dlg/dlgassim.hxx|4 +--
sd/source/ui/dlg/dlgctrls.cxx|2 -
sd/source/ui/dlg/dlgfield.cxx| 16 ++---
sd/source/ui/dlg/dlgolbul.cxx|3 --
sd/source/ui/dlg/dlgsnap.cxx |4 +--
sd/source/ui/dlg/filedlg.cxx | 34 ++---
sd/source/ui/dlg/gluectrl.cxx| 27 +++
sd/source/ui/dlg/headerfooterdlg.cxx | 11 -
sd/source/ui/dlg/inspagob.cxx|4 +--
sd/source/ui/dlg/navigatr.cxx| 41 +--
sd/source/ui/dlg/present.cxx | 15 +---
sd/source/ui/dlg/prltempl.cxx|3 --
sd/source/ui/dlg/sddlgfact.cxx |6 ++---
sd/source/ui/dlg/sddlgfact.hxx |6 ++---
sd/source/ui/func/fusldlg.cxx|9 +++
sd/source/ui/inc/filedlg.hxx |4 +--
sd/source/ui/inc/inspagob.hxx|4 +--
sd/source/ui/inc/navigatr.hxx|6 ++---
sd/source/ui/inc/present.hxx |4 +--
21 files changed, 106 insertions(+), 113 deletions(-)
New commits:
commit 4802bf2da3439cfddde79a4193e642dac58eab9d
Author: Ivan Timofeev
Date: Wed Aug 21 15:25:35 2013 +0400
String->OUString
Change-Id: Ifb3a2f8ef959baec38fe0168a9e88e85da0d9744
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 4d5111f..f100c17 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -183,14 +183,14 @@ public:
virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent,
sal_Bool bAutoPilot) = 0;
virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window*
pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0;
virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window*
pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0;
-virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window*
pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ) = 0;
+virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window*
pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) =
0;
virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window*
pWindow ) = 0;
-virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg(
::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const
String& rFileName ) = 0;
+virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg(
::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const
OUString& rFileName ) = 0;
virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent,
const SdrObject* pObj1, const SdrObject* pObj2) = 0;
virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg (
::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0;
virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window*
pParent, const SfxItemSet* pAttr ) = 0;
virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg(
::Window* pWindow, const SfxItemSet& rInAttrs,
- const
std::vector &rPageNames, SdCustomShowList* pCSList ) = 0;
+ const
std::vector &rPageNames, SdCustomShowList* pCSList ) = 0;
virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow
) = 0;
virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg(
SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase&
rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
virtual AbstractSdPresLayoutDlg*CreateSdPresLayoutDlg(
::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) =
0;
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index 8092669..9eff528 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -76,7 +76,7 @@ void SdPageListControl::Clear()
SvTreeListBox::Clear();
}
-SvTreeListEntry* SdPageListControl::InsertPage( const String& rPageName )
+SvTreeListEntry* SdPageListControl::InsertPage( const OUString& rPageName )
{
SvTreeListEntry* pEntry = new SvTreeListEntry;
@@ -90,10 +90,10 @@ SvTreeListEntry* SdPageListControl::InsertPage( const
String& rPageName )
return pEntry;
}
-void SdPageListControl::InsertTitle( SvTreeListEntry* pParent, const String&
rTitle )
+void SdPageListControl::InsertTitle( SvTreeListEntry* pParent, const OUString&
rTitle )
{
SvTreeListEntry* pEntry = new SvTreeListEntry;
-pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) );
+pEntry->AddItem( new SvLBoxString( pEntry, 0, OUString() )
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- sc/uiconfig/scalc/menubar/menubar.xml|1 + sd/uiconfig/sdraw/menubar/menubar.xml|1 + sd/uiconfig/simpress/menubar/menubar.xml |1 + sw/uiconfig/sglobal/menubar/menubar.xml |1 + sw/uiconfig/swform/menubar/menubar.xml |1 + sw/uiconfig/swreport/menubar/menubar.xml |1 + sw/uiconfig/swriter/menubar/menubar.xml |1 + sw/uiconfig/swxform/menubar/menubar.xml |1 + 9 files changed, 9 insertions(+), 1 deletion(-) New commits: commit f2bfb0d4a4b206852c811b18b25ca508a40aee7f Author: Ivan Timofeev Date: Thu Aug 22 18:33:35 2013 +0400 fdo#68252: Add FONTWORK into the INSERT menu Change-Id: Icdb1774996e9b9669e95fdbefca0be054f91465a diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 809cee0..5fc448b 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -32,7 +32,7 @@ - Fontwork Gallery + Fontwork Gallery... 9 diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index d2bda57..6271a36 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -211,6 +211,7 @@ + diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index c3021faf..6e8f9e4 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -189,6 +189,7 @@ + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 2fd3032..a9ef76a 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -207,6 +207,7 @@ + diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index a72d86f..334fc37 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -220,6 +220,7 @@ + diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 5dde902..4f52a7b 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -219,6 +219,7 @@ + diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 5f57d46..00be724 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -220,6 +220,7 @@ + diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 71f9b4d..dd05e1f 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -227,6 +227,7 @@ + diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index be5e2cd..a3607b6 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -221,6 +221,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 7 commits - boost/boost_1_44_0-gcc4.8.patch boost/UnpackedTarball_boost.mk connectivity/source dbaccess/source extensions/source jvmfwk/plugi
boost/UnpackedTarball_boost.mk|2
boost/boost_1_44_0-gcc4.8.patch | 226 ++
connectivity/source/drivers/evoab2/NStatement.hxx |2
dbaccess/source/core/api/RowSet.cxx | 10
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx |9
dbaccess/source/ui/dlg/indexdialog.cxx|6
dbaccess/source/ui/misc/dsmeta.cxx|6
extensions/source/dbpilots/gridwizard.cxx | 20 -
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |1
reportdesign/source/filter/xml/xmlControlProperty.cxx |9
sd/source/ui/dlg/RemoteDialogClientBox.cxx|2
shell/source/backends/gconfbe/gconfaccess.cxx |2
shell/source/sessioninstall/SyncDbusSessionHelper.cxx |2
svx/source/form/fmshimp.cxx | 12
toolkit/source/controls/unocontrol.cxx|8
tubes/source/manager.cxx |2
ucb/source/ucp/gio/gio_provider.cxx |4
xmloff/source/forms/propertyimport.cxx|5
18 files changed, 285 insertions(+), 43 deletions(-)
New commits:
commit 970dcd197a69cbc6f6801fbf51299ac1e8f7c4ef
Author: Ivan Timofeev
Date: Fri Apr 19 17:41:20 2013 +0400
use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XX
Michael Meeks pointed out that the latter can cause problems.
Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93
(cherry picked from commit 9dd52eb86a9122e34c307a9160ae3ccd5706c94e)
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx
b/shell/source/backends/gconfbe/gconfaccess.cxx
index 532fd10..70016ab 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,7 +51,7 @@ GConfClient* getGconfClient()
static GConfClient* mClient= 0;
if (mClient == NULL)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
/* initialize glib object type library */
g_type_init();
#endif
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index 9967548..4c3baf5 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -62,7 +62,7 @@ namespace shell { namespace sessioninstall
{
SyncDbusSessionHelper::SyncDbusSessionHelper(Reference
const&)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init ();
#endif
}
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index a3c8990..0a97aeb 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -889,7 +889,7 @@ TeleManagerImpl::TeleManagerImpl()
mpFileTransferClient( NULL),
mpAccountManager( NULL)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init();
#endif
}
diff --git a/ucb/source/ucp/gio/gio_provider.cxx
b/ucb/source/ucp/gio/gio_provider.cxx
index c95117b..bf6a501 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,7 +100,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL
ucpgio1_component_getFactory( co
uno::Reference< lang::XMultiServiceFactory > xSMgr
(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory;
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init();
#endif
if (
!::gio::ContentProvider::getImplementationName_Static().compareToAscii(
pImplName ) )
commit 906e5677ae9255ff2aac735ce6e91ab222ba58e6
Author: Ivan Timofeev
Date: Wed Apr 17 20:04:45 2013 +0400
WaE: g_type_init has been deprecated since GLib 2.36
Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
Reviewed-on: https://gerrit.libreoffice.org/3434
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 025857d81d4781a95cda4e790808b05b97eb97d9)
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx
b/shell/source/backends/gconfbe/gconfaccess.cxx
index 205a2cf..532fd10 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,8 +51,10 @@ GConfClient* getGconfClient()
static GConfClient* mClient= 0;
if (mClient == NULL)
{
+#if !defined(GLIB_VERSION_2_36)
/* initialize glib object type library */
g_type_init();
+#endif
GError* aError = NULL;
if (!gconf_init(0, NULL, &aError))
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index 47f0749..9967548 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.c
Re: [PATCH] fdo#64455 Add default line color to standard.soc
Hi Laurent, On 22.08.2013 12:02, Laurent BP wrote: > The default line color is #3465af which is not present in any palette. Weird. :) It's even not a tango color[1]. I'd change the default to "Tango: Sky Blue 2" (#3465a4) and recommit http://cgit.freedesktop.org/libreoffice/core/commit/?id=b9c98414ec9084cf97b5dcc911fb9941b5e57ebb "Added Tango colors to palette" which was reverted for some reason... Commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=895890563cb0cc5fa872bdfd06918a46cdda172d "Change default shape color" shows where the defaults are hiding. :) > I propose to add it to standard.soc. And then, how about fixing the line color listbox, so that it will show unknown colors like the fill color listbox does? Then we can backport that fix to 4-1 and 4-0 without introducing a new UI string. Do you want to look at that? It's SvxLineColorToolBoxControl[2] and IIRC the StateChanged method is called on a color update. [1] http://cgit.freedesktop.org/libreoffice/core/tree/extras/source/palettes/tango.soc [2] http://opengrok.libreoffice.org/search?q=&project=core&defs=SvxLineColorToolBoxControl&refs=&path=&hist= Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] fdo#39468 German comments for svx/source/tbxctrls/linectrl.cxx
Thanks, pushed. Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] fdo#39468 German comments for svx/source/tbxctrls/fillctrl.cxx
Thanks, pushed as well. Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - icon-themes/crystal icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango icon-themes/tango_testing sd/source
icon-themes/crystal/cmd/lc_fliphorizontal.png |binary icon-themes/crystal/cmd/lc_flipvertical.png |binary icon-themes/crystal/cmd/sc_fliphorizontal.png |binary icon-themes/crystal/cmd/sc_flipvertical.png |binary icon-themes/human/cmd/lc_fliphorizontal.png |binary icon-themes/human/cmd/lc_flipvertical.png |binary icon-themes/human/cmd/sc_fliphorizontal.png |binary icon-themes/human/cmd/sc_flipvertical.png |binary icon-themes/industrial/cmd/lc_fliphorizontal.png|binary icon-themes/industrial/cmd/lc_flipvertical.png |binary icon-themes/industrial/cmd/sc_fliphorizontal.png|binary icon-themes/industrial/cmd/sc_flipvertical.png |binary icon-themes/oxygen/cmd/lc_fliphorizontal.png|binary icon-themes/oxygen/cmd/lc_flipvertical.png |binary icon-themes/oxygen/cmd/sc_fliphorizontal.png|binary icon-themes/oxygen/cmd/sc_flipvertical.png |binary icon-themes/tango/cmd/lc_fliphorizontal.png |binary icon-themes/tango/cmd/lc_flipvertical.png |binary icon-themes/tango/cmd/sc_fliphorizontal.png |binary icon-themes/tango/cmd/sc_flipvertical.png |binary icon-themes/tango_testing/cmd/lc_fliphorizontal.png |binary icon-themes/tango_testing/cmd/lc_fliphorizontal.svg | 3308 icon-themes/tango_testing/cmd/lc_flipvertical.png |binary icon-themes/tango_testing/cmd/lc_flipvertical.svg | 3308 sd/source/ui/dlg/sdtreelb.cxx | 55 sd/source/ui/inc/sdtreelb.hxx | 15 26 files changed, 3342 insertions(+), 3344 deletions(-) New commits: commit 07aefbe310cad43bf9a71ba073486cddd7e062f2 Author: Ivan Timofeev Date: Sun Sep 1 10:08:38 2013 +0400 fdo#42434: swap flipvertical and fliphorizontal icons in some themes Change-Id: I484a783547c3bed1d80a0f510434b4c0fe37bed7 diff --git a/icon-themes/crystal/cmd/lc_fliphorizontal.png b/icon-themes/crystal/cmd/lc_fliphorizontal.png index 6eed975..5440863 100644 Binary files a/icon-themes/crystal/cmd/lc_fliphorizontal.png and b/icon-themes/crystal/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/lc_flipvertical.png b/icon-themes/crystal/cmd/lc_flipvertical.png index 5440863..6eed975 100644 Binary files a/icon-themes/crystal/cmd/lc_flipvertical.png and b/icon-themes/crystal/cmd/lc_flipvertical.png differ diff --git a/icon-themes/crystal/cmd/sc_fliphorizontal.png b/icon-themes/crystal/cmd/sc_fliphorizontal.png index 73f6b0e..f16cf5e 100644 Binary files a/icon-themes/crystal/cmd/sc_fliphorizontal.png and b/icon-themes/crystal/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/sc_flipvertical.png b/icon-themes/crystal/cmd/sc_flipvertical.png index f16cf5e..73f6b0e 100644 Binary files a/icon-themes/crystal/cmd/sc_flipvertical.png and b/icon-themes/crystal/cmd/sc_flipvertical.png differ diff --git a/icon-themes/human/cmd/lc_fliphorizontal.png b/icon-themes/human/cmd/lc_fliphorizontal.png index b02e1fd..116cad6 100644 Binary files a/icon-themes/human/cmd/lc_fliphorizontal.png and b/icon-themes/human/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/lc_flipvertical.png b/icon-themes/human/cmd/lc_flipvertical.png index 116cad6..b02e1fd 100644 Binary files a/icon-themes/human/cmd/lc_flipvertical.png and b/icon-themes/human/cmd/lc_flipvertical.png differ diff --git a/icon-themes/human/cmd/sc_fliphorizontal.png b/icon-themes/human/cmd/sc_fliphorizontal.png index 9a2994b..901b218 100644 Binary files a/icon-themes/human/cmd/sc_fliphorizontal.png and b/icon-themes/human/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/sc_flipvertical.png b/icon-themes/human/cmd/sc_flipvertical.png index 901b218..9a2994b 100644 Binary files a/icon-themes/human/cmd/sc_flipvertical.png and b/icon-themes/human/cmd/sc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/lc_fliphorizontal.png b/icon-themes/industrial/cmd/lc_fliphorizontal.png index ef1c256..a972d2c 100644 Binary files a/icon-themes/industrial/cmd/lc_fliphorizontal.png and b/icon-themes/industrial/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/lc_flipvertical.png b/icon-themes/industrial/cmd/lc_flipvertical.png index a972d2c..ef1c256 100644 Binary files a/icon-themes/industrial/cmd/lc_flipvertical.png and b/icon-themes/industrial/cmd/lc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/sc_fliphorizontal.png b/icon-themes/industrial/cmd/sc_fliphorizontal.png index 761d90e..1744b76 100644 Binary files a/icon-themes/industrial/cmd/sc_fliphorizontal.png and b/icon-themes/industrial/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/sc_flipvertical.png b/icon-themes/industrial/cmd/sc_flipvertical.png index 1744b76..761d90e 100644 Binary files a/icon-themes/industrial/cmd/sc_flipvertical.png and b/icon-themes/industrial/cmd
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - icon-themes/crystal icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango
icon-themes/crystal/cmd/lc_fliphorizontal.png|binary icon-themes/crystal/cmd/lc_flipvertical.png |binary icon-themes/crystal/cmd/sc_fliphorizontal.png|binary icon-themes/crystal/cmd/sc_flipvertical.png |binary icon-themes/human/cmd/lc_fliphorizontal.png |binary icon-themes/human/cmd/lc_flipvertical.png|binary icon-themes/human/cmd/sc_fliphorizontal.png |binary icon-themes/human/cmd/sc_flipvertical.png|binary icon-themes/industrial/cmd/lc_fliphorizontal.png |binary icon-themes/industrial/cmd/lc_flipvertical.png |binary icon-themes/industrial/cmd/sc_fliphorizontal.png |binary icon-themes/industrial/cmd/sc_flipvertical.png |binary icon-themes/oxygen/cmd/lc_fliphorizontal.png |binary icon-themes/oxygen/cmd/lc_flipvertical.png |binary icon-themes/oxygen/cmd/sc_fliphorizontal.png |binary icon-themes/oxygen/cmd/sc_flipvertical.png |binary icon-themes/tango/cmd/lc_fliphorizontal.png |binary icon-themes/tango/cmd/lc_flipvertical.png|binary icon-themes/tango/cmd/sc_fliphorizontal.png |binary icon-themes/tango/cmd/sc_flipvertical.png|binary 20 files changed New commits: commit 178d86a99820c5e0b9ca668c49300d468ab70e10 Author: Ivan Timofeev Date: Sun Sep 1 10:08:38 2013 +0400 fdo#42434: swap flipvertical and fliphorizontal icons in some themes (cherry picked from commit 07aefbe310cad43bf9a71ba073486cddd7e062f2) Conflicts: icon-themes/tango_testing/cmd/lc_fliphorizontal.png icon-themes/tango_testing/cmd/lc_fliphorizontal.svg icon-themes/tango_testing/cmd/lc_flipvertical.png Change-Id: I037b55811bf7f14a7aadcb85ae700516022896ce Reviewed-on: https://gerrit.libreoffice.org/5727 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/icon-themes/crystal/cmd/lc_fliphorizontal.png b/icon-themes/crystal/cmd/lc_fliphorizontal.png index 6eed975..5440863 100644 Binary files a/icon-themes/crystal/cmd/lc_fliphorizontal.png and b/icon-themes/crystal/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/lc_flipvertical.png b/icon-themes/crystal/cmd/lc_flipvertical.png index 5440863..6eed975 100644 Binary files a/icon-themes/crystal/cmd/lc_flipvertical.png and b/icon-themes/crystal/cmd/lc_flipvertical.png differ diff --git a/icon-themes/crystal/cmd/sc_fliphorizontal.png b/icon-themes/crystal/cmd/sc_fliphorizontal.png index 73f6b0e..f16cf5e 100644 Binary files a/icon-themes/crystal/cmd/sc_fliphorizontal.png and b/icon-themes/crystal/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/sc_flipvertical.png b/icon-themes/crystal/cmd/sc_flipvertical.png index f16cf5e..73f6b0e 100644 Binary files a/icon-themes/crystal/cmd/sc_flipvertical.png and b/icon-themes/crystal/cmd/sc_flipvertical.png differ diff --git a/icon-themes/human/cmd/lc_fliphorizontal.png b/icon-themes/human/cmd/lc_fliphorizontal.png index b02e1fd..116cad6 100644 Binary files a/icon-themes/human/cmd/lc_fliphorizontal.png and b/icon-themes/human/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/lc_flipvertical.png b/icon-themes/human/cmd/lc_flipvertical.png index 116cad6..b02e1fd 100644 Binary files a/icon-themes/human/cmd/lc_flipvertical.png and b/icon-themes/human/cmd/lc_flipvertical.png differ diff --git a/icon-themes/human/cmd/sc_fliphorizontal.png b/icon-themes/human/cmd/sc_fliphorizontal.png index 9a2994b..901b218 100644 Binary files a/icon-themes/human/cmd/sc_fliphorizontal.png and b/icon-themes/human/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/sc_flipvertical.png b/icon-themes/human/cmd/sc_flipvertical.png index 901b218..9a2994b 100644 Binary files a/icon-themes/human/cmd/sc_flipvertical.png and b/icon-themes/human/cmd/sc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/lc_fliphorizontal.png b/icon-themes/industrial/cmd/lc_fliphorizontal.png index ef1c256..a972d2c 100644 Binary files a/icon-themes/industrial/cmd/lc_fliphorizontal.png and b/icon-themes/industrial/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/lc_flipvertical.png b/icon-themes/industrial/cmd/lc_flipvertical.png index a972d2c..ef1c256 100644 Binary files a/icon-themes/industrial/cmd/lc_flipvertical.png and b/icon-themes/industrial/cmd/lc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/sc_fliphorizontal.png b/icon-themes/industrial/cmd/sc_fliphorizontal.png index 761d90e..1744b76 100644 Binary files a/icon-themes/industrial/cmd/sc_fliphorizontal.png and b/icon-themes/industrial/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/sc_flipvertical.png b/icon-themes/industrial/cmd/sc_flipvertical.png index 1744b76..761d90e 100644 Binary files a/icon-themes/industrial/cmd/sc_flipvertical.png and b/icon-themes/industrial/cmd/sc_flipvertical.png differ diff --git a/icon-themes/oxygen/cmd/lc_fliphorizontal.png b/icon-themes/oxygen/cmd
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - icon-themes/crystal icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango icon-themes/tango_testing
icon-themes/crystal/cmd/lc_fliphorizontal.png |binary icon-themes/crystal/cmd/lc_flipvertical.png |binary icon-themes/crystal/cmd/sc_fliphorizontal.png |binary icon-themes/crystal/cmd/sc_flipvertical.png |binary icon-themes/human/cmd/lc_fliphorizontal.png |binary icon-themes/human/cmd/lc_flipvertical.png |binary icon-themes/human/cmd/sc_fliphorizontal.png |binary icon-themes/human/cmd/sc_flipvertical.png |binary icon-themes/industrial/cmd/lc_fliphorizontal.png|binary icon-themes/industrial/cmd/lc_flipvertical.png |binary icon-themes/industrial/cmd/sc_fliphorizontal.png|binary icon-themes/industrial/cmd/sc_flipvertical.png |binary icon-themes/oxygen/cmd/lc_fliphorizontal.png|binary icon-themes/oxygen/cmd/lc_flipvertical.png |binary icon-themes/oxygen/cmd/sc_fliphorizontal.png|binary icon-themes/oxygen/cmd/sc_flipvertical.png |binary icon-themes/tango/cmd/lc_fliphorizontal.png |binary icon-themes/tango/cmd/lc_flipvertical.png |binary icon-themes/tango/cmd/sc_fliphorizontal.png |binary icon-themes/tango/cmd/sc_flipvertical.png |binary icon-themes/tango_testing/cmd/lc_fliphorizontal.png |binary icon-themes/tango_testing/cmd/lc_fliphorizontal.svg | 3308 icon-themes/tango_testing/cmd/lc_flipvertical.png |binary icon-themes/tango_testing/cmd/lc_flipvertical.svg | 3308 24 files changed, 3308 insertions(+), 3308 deletions(-) New commits: commit 3cbe753186c9c0ea437a9bcc6dc64c63082ba37b Author: Ivan Timofeev Date: Sun Sep 1 10:08:38 2013 +0400 fdo#42434: swap flipvertical and fliphorizontal icons in some themes Change-Id: I484a783547c3bed1d80a0f510434b4c0fe37bed7 (cherry picked from commit 07aefbe310cad43bf9a71ba073486cddd7e062f2) Reviewed-on: https://gerrit.libreoffice.org/5725 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/icon-themes/crystal/cmd/lc_fliphorizontal.png b/icon-themes/crystal/cmd/lc_fliphorizontal.png index 6eed975..5440863 100644 Binary files a/icon-themes/crystal/cmd/lc_fliphorizontal.png and b/icon-themes/crystal/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/lc_flipvertical.png b/icon-themes/crystal/cmd/lc_flipvertical.png index 5440863..6eed975 100644 Binary files a/icon-themes/crystal/cmd/lc_flipvertical.png and b/icon-themes/crystal/cmd/lc_flipvertical.png differ diff --git a/icon-themes/crystal/cmd/sc_fliphorizontal.png b/icon-themes/crystal/cmd/sc_fliphorizontal.png index 73f6b0e..f16cf5e 100644 Binary files a/icon-themes/crystal/cmd/sc_fliphorizontal.png and b/icon-themes/crystal/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/sc_flipvertical.png b/icon-themes/crystal/cmd/sc_flipvertical.png index f16cf5e..73f6b0e 100644 Binary files a/icon-themes/crystal/cmd/sc_flipvertical.png and b/icon-themes/crystal/cmd/sc_flipvertical.png differ diff --git a/icon-themes/human/cmd/lc_fliphorizontal.png b/icon-themes/human/cmd/lc_fliphorizontal.png index b02e1fd..116cad6 100644 Binary files a/icon-themes/human/cmd/lc_fliphorizontal.png and b/icon-themes/human/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/lc_flipvertical.png b/icon-themes/human/cmd/lc_flipvertical.png index 116cad6..b02e1fd 100644 Binary files a/icon-themes/human/cmd/lc_flipvertical.png and b/icon-themes/human/cmd/lc_flipvertical.png differ diff --git a/icon-themes/human/cmd/sc_fliphorizontal.png b/icon-themes/human/cmd/sc_fliphorizontal.png index 9a2994b..901b218 100644 Binary files a/icon-themes/human/cmd/sc_fliphorizontal.png and b/icon-themes/human/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/sc_flipvertical.png b/icon-themes/human/cmd/sc_flipvertical.png index 901b218..9a2994b 100644 Binary files a/icon-themes/human/cmd/sc_flipvertical.png and b/icon-themes/human/cmd/sc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/lc_fliphorizontal.png b/icon-themes/industrial/cmd/lc_fliphorizontal.png index ef1c256..a972d2c 100644 Binary files a/icon-themes/industrial/cmd/lc_fliphorizontal.png and b/icon-themes/industrial/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/lc_flipvertical.png b/icon-themes/industrial/cmd/lc_flipvertical.png index a972d2c..ef1c256 100644 Binary files a/icon-themes/industrial/cmd/lc_flipvertical.png and b/icon-themes/industrial/cmd/lc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/sc_fliphorizontal.png b/icon-themes/industrial/cmd/sc_fliphorizontal.png index 761d90e..1744b76 100644 Binary files a/icon-themes/industrial/cmd/sc_fliphorizontal.png and b/icon-themes/industrial/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/sc_flipvertical.png b/icon-themes/industrial/cmd/sc_flipvertical.png index 1744b76..761d90e 100644 Binary files a/icon-themes
[Libreoffice-commits] core.git: 3 commits - officecfg/registry sd/source
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 16 --
sd/source/ui/dlg/tpaction.cxx | 56
+-
sd/source/ui/inc/tpaction.hxx |6 -
3 files changed, 31 insertions(+), 47 deletions(-)
New commits:
commit a3411f532c40b4326d5ee2e1d2fe23fea457e0a6
Author: Ivan Timofeev
Date: Sun Sep 1 16:38:29 2013 +0400
String->OUString
Change-Id: I4d822fdb3dfb1e07d2c0e0352809f9d51bf9dfc4
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 53e5b1a..225d01c 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -71,7 +71,7 @@ using namespace ::com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-#define DOCUMENT_TOKEN (sal_Unicode('#'))
+#define DOCUMENT_TOKEN '#'
/**
* Constructor of the Tab dialog: appends the pages to the dialog
@@ -91,8 +91,8 @@ SdActionDlg::SdActionDlg (
SetTabPage( pNewPage );
-String aStr( pNewPage->GetText() );
-if( aStr.Len() )
+OUString aStr( pNewPage->GetText() );
+if( !aStr.isEmpty() )
SetText( aStr );
}
@@ -238,7 +238,7 @@ void SdTPAction::Construct()
embed::VerbDescriptor aVerb = aVerbs[i];
if( aVerb.VerbAttributes &
embed::VerbAttributes::MS_VERBATTR_ONCONTAINERMENU )
{
-String aTmp( aVerb.VerbName );
+OUString aTmp( aVerb.VerbName );
aVerbVector.push_back( aVerb.VerbID );
aLbOLEAction.InsertEntry(
MnemonicGenerator::EraseAllMnemonicChars( aTmp ) );
}
@@ -287,14 +287,14 @@ sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs )
else
rAttrs.InvalidateItem( ATTR_ACTION );
-String aFileName = GetEditText( sal_True );
-if( aFileName.Len() == 0 )
+OUString aFileName = GetEditText( sal_True );
+if( aFileName.isEmpty() )
rAttrs.InvalidateItem( ATTR_ACTION_FILENAME );
else
{
if( mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() )
{
-String aBaseURL = mpDoc->GetDocSh()->GetMedium()->GetBaseURL();
+OUString aBaseURL = mpDoc->GetDocSh()->GetMedium()->GetBaseURL();
if( eCA == presentation::ClickAction_SOUND ||
eCA == presentation::ClickAction_DOCUMENT ||
eCA == presentation::ClickAction_PROGRAM )
@@ -319,7 +319,7 @@ sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs )
void SdTPAction::Reset( const SfxItemSet& rAttrs )
{
presentation::ClickAction eCA = presentation::ClickAction_NONE;
-String aFileName;
+OUString aFileName;
// aLbAction
if( rAttrs.GetItemState( ATTR_ACTION ) != SFX_ITEM_DONTCARE )
@@ -350,7 +350,7 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs )
case presentation::ClickAction_DOCUMENT:
{
if( comphelper::string::getTokenCount(aFileName, DOCUMENT_TOKEN)
== 2 )
-aLbTreeDocument.SelectEntry( aFileName.GetToken( 1,
DOCUMENT_TOKEN ) );
+aLbTreeDocument.SelectEntry( aFileName.getToken( 1,
DOCUMENT_TOKEN ) );
}
break;
@@ -418,13 +418,13 @@ void SdTPAction::OpenFileDialog()
}
else
{
-String aFile( GetEditText() );
+OUString aFile( GetEditText() );
if (bSound)
{
SdOpenSoundFileDialog aFileDialog;
-if( !aFile.Len() )
+if( aFile.isEmpty() )
aFile = SvtPathOptions().GetGraphicPath();
aFileDialog.SetPath( aFile );
@@ -455,7 +455,7 @@ void SdTPAction::OpenFileDialog()
sfx2::FileDialogHelper aFileDialog(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
0);
-if (bDocument && !aFile.Len())
+if (bDocument && aFile.isEmpty())
aFile = SvtPathOptions().GetWorkPath();
aFileDialog.SetDisplayDirectory( aFile );
@@ -465,7 +465,7 @@ void SdTPAction::OpenFileDialog()
// filter makes the (Windows system) open file dialog follow
// links on the desktop to directories.
aFileDialog.AddFilter (
-String (SfxResId (STR_SFX_FILTERNAME_ALL)),
+SFX2_RESSTR(STR_SFX_FILTERNAME_ALL),
OUString("*.*"));
@@ -678,7 +678,7 @@ IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl)
IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
{
-String aFile( GetEditText() );
+OUString aFile( GetEditText() );
if( aFile != aLastFile )
{
@@ -749,17 +749,17 @@ void SdTPAction::SetActualClickAction(
presentation::ClickAction eCA )
//
-void SdTPAction::SetEd
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 1 file changed, 8 deletions(-) New commits: commit d04e98d4ef8d15c9e8c76d0a61fd0aa45e75b1e8 Author: Ivan Timofeev Date: Sun Sep 1 17:48:32 2013 +0400 fdo#67584: remove .uno:FlipVertical from WriterCommands.xcu mismerge in c991fb49aa174f300be0b978d89bc63e01e0aa2b Change-Id: I7d890495bac0fa1a458a86c8625158c94cdba717 (cherry picked from commit 58aa737b2a37fa939580ee65f8976a13870b1de9) Reviewed-on: https://gerrit.libreoffice.org/5741 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index c8dc745..a4f5bcc 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -720,14 +720,6 @@ Outline to ~Clipboard - - - Flip Horizontally - - - 1 - - Rotate 90° ~Left ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - icon-themes/crystal icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango
icon-themes/crystal/cmd/lc_fliphorizontal.png|binary icon-themes/crystal/cmd/lc_flipvertical.png |binary icon-themes/crystal/cmd/sc_fliphorizontal.png|binary icon-themes/crystal/cmd/sc_flipvertical.png |binary icon-themes/human/cmd/lc_fliphorizontal.png |binary icon-themes/human/cmd/lc_flipvertical.png|binary icon-themes/human/cmd/sc_fliphorizontal.png |binary icon-themes/human/cmd/sc_flipvertical.png|binary icon-themes/industrial/cmd/lc_fliphorizontal.png |binary icon-themes/industrial/cmd/lc_flipvertical.png |binary icon-themes/industrial/cmd/sc_fliphorizontal.png |binary icon-themes/industrial/cmd/sc_flipvertical.png |binary icon-themes/oxygen/cmd/lc_fliphorizontal.png |binary icon-themes/oxygen/cmd/lc_flipvertical.png |binary icon-themes/oxygen/cmd/sc_fliphorizontal.png |binary icon-themes/oxygen/cmd/sc_flipvertical.png |binary icon-themes/tango/cmd/lc_fliphorizontal.png |binary icon-themes/tango/cmd/lc_flipvertical.png|binary icon-themes/tango/cmd/sc_fliphorizontal.png |binary icon-themes/tango/cmd/sc_flipvertical.png|binary 20 files changed New commits: commit addd1a6a9b0f4e21648ddbafeb2ffd6c324aa2e1 Author: Ivan Timofeev Date: Sun Sep 1 22:33:45 2013 +0400 Revert "fdo#42434: swap flipvertical and fliphorizontal icons in some themes" This reverts commit 178d86a99820c5e0b9ca668c49300d468ab70e10. Turns out it's not needed in this branch. The bug version is 3.4.3, so I thought that all versions 3-4..4-2 are broken. Surprisingly 4-0 was already fixed, and 4-1 is broken again... Change-Id: I48bc00d72e360073db3c4e1cd9d14dd5fcb5ebf6 Reviewed-on: https://gerrit.libreoffice.org/5744 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/icon-themes/crystal/cmd/lc_fliphorizontal.png b/icon-themes/crystal/cmd/lc_fliphorizontal.png index 5440863..6eed975 100644 Binary files a/icon-themes/crystal/cmd/lc_fliphorizontal.png and b/icon-themes/crystal/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/lc_flipvertical.png b/icon-themes/crystal/cmd/lc_flipvertical.png index 6eed975..5440863 100644 Binary files a/icon-themes/crystal/cmd/lc_flipvertical.png and b/icon-themes/crystal/cmd/lc_flipvertical.png differ diff --git a/icon-themes/crystal/cmd/sc_fliphorizontal.png b/icon-themes/crystal/cmd/sc_fliphorizontal.png index f16cf5e..73f6b0e 100644 Binary files a/icon-themes/crystal/cmd/sc_fliphorizontal.png and b/icon-themes/crystal/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/sc_flipvertical.png b/icon-themes/crystal/cmd/sc_flipvertical.png index 73f6b0e..f16cf5e 100644 Binary files a/icon-themes/crystal/cmd/sc_flipvertical.png and b/icon-themes/crystal/cmd/sc_flipvertical.png differ diff --git a/icon-themes/human/cmd/lc_fliphorizontal.png b/icon-themes/human/cmd/lc_fliphorizontal.png index 116cad6..b02e1fd 100644 Binary files a/icon-themes/human/cmd/lc_fliphorizontal.png and b/icon-themes/human/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/lc_flipvertical.png b/icon-themes/human/cmd/lc_flipvertical.png index b02e1fd..116cad6 100644 Binary files a/icon-themes/human/cmd/lc_flipvertical.png and b/icon-themes/human/cmd/lc_flipvertical.png differ diff --git a/icon-themes/human/cmd/sc_fliphorizontal.png b/icon-themes/human/cmd/sc_fliphorizontal.png index 901b218..9a2994b 100644 Binary files a/icon-themes/human/cmd/sc_fliphorizontal.png and b/icon-themes/human/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/sc_flipvertical.png b/icon-themes/human/cmd/sc_flipvertical.png index 9a2994b..901b218 100644 Binary files a/icon-themes/human/cmd/sc_flipvertical.png and b/icon-themes/human/cmd/sc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/lc_fliphorizontal.png b/icon-themes/industrial/cmd/lc_fliphorizontal.png index a972d2c..ef1c256 100644 Binary files a/icon-themes/industrial/cmd/lc_fliphorizontal.png and b/icon-themes/industrial/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/lc_flipvertical.png b/icon-themes/industrial/cmd/lc_flipvertical.png index ef1c256..a972d2c 100644 Binary files a/icon-themes/industrial/cmd/lc_flipvertical.png and b/icon-themes/industrial/cmd/lc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/sc_fliphorizontal.png b/icon-themes/industrial/cmd/sc_fliphorizontal.png index 1744b76..761d90e 100644 Binary files a/icon-themes/industrial/cmd/sc_fliphorizontal.png and b/icon-themes/industrial/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/sc_flipvertical.png b/icon-themes/industrial/cmd/sc_flipvertical.png index 761d90e..1744b76 100644 Binary files a/icon-themes/industrial/cmd/sc_flipvertical.png and b/icon-themes/industrial/cmd/sc_flipvertical.png differ diff --git a/icon-themes/oxygen/cmd/lc_fliphorizontal.png b/ico
[Libreoffice-commits] core.git: 3 commits - sd/source
sd/source/ui/inc/PreviewRenderer.hxx |8
sd/source/ui/inc/unomodel.hxx |2
sd/source/ui/presenter/PresenterTextView.cxx |2
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx|1
sd/source/ui/slideshow/slideshow.cxx |2
sd/source/ui/slideshow/slideshowimpl.cxx |2
sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx |1
sd/source/ui/tools/PreviewRenderer.cxx| 10
sd/source/ui/unoidl/unoobj.cxx|4
sd/source/ui/unoidl/unopage.cxx | 114 --
sd/source/ui/unoidl/unopage.hxx |6
11 files changed, 73 insertions(+), 79 deletions(-)
New commits:
commit 5d6a994b336365017d0bb54ebc5dabac7d99
Author: Ivan Timofeev
Date: Mon Sep 2 17:38:31 2013 +0400
String->OUString
Change-Id: Ic7e61d002638991f2d69462d343f1b29bc9b0040
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index 5d476e8..6495c64 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -57,7 +57,7 @@ class DrawDocShell;
}
extern OUString getPageApiName( SdPage* pPage );
-extern OUString getPageApiNameFromUiName( const String& rUIName );
+extern OUString getPageApiNameFromUiName( const OUString& rUIName );
/***
* *
diff --git a/sd/source/ui/slideshow/slideshow.cxx
b/sd/source/ui/slideshow/slideshow.cxx
index a510589..9abf0aa 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -68,7 +68,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::animations;
using namespace ::com::sun::star::drawing::framework;
-extern String getUiNameFromPageApiNameImpl( const OUString& rApiName );
+extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
namespace {
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index bf4e57e..8db58e2 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -93,7 +93,7 @@ using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::beans;
extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString&
rEventName );
-extern String getUiNameFromPageApiNameImpl( const OUString& rApiName );
+extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
namespace sd
{
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 2444d69..72a3b49 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -89,8 +89,8 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::drawing::XShape;
-extern OUString getPageApiNameFromUiName( const String& rUIName );
-extern String getUiNameFromPageApiNameImpl( const OUString& rApiName );
+extern OUString getPageApiNameFromUiName( const OUString& rUIName );
+extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
///
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 29356b6..6e0a78a 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -400,9 +400,9 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const
Reference< drawing::XShap
if( NULL == SvxFmDrawPage::mpPage || !xShape.is() )
return NULL;
-String aType( xShape->getShapeType() );
-const String aPrefix( "com.sun.star.presentation." );
-if( aType.CompareTo( aPrefix, aPrefix.Len() ) != 0 )
+OUString aType( xShape->getShapeType() );
+const OUString aPrefix( "com.sun.star.presentation." );
+if( !aType.startsWith( aPrefix ) )
{
SdrObject* pObj = SvxFmDrawPage::_CreateSdrObject( xShape );
if( pObj && ( (pObj->GetObjInventor() != SdrInventor) ||
(pObj->GetObjIdentifier() != OBJ_PAGE) ) )
@@ -414,78 +414,78 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const
Reference< drawing::XShap
return pObj;
}
-aType = aType.Copy( aPrefix.Len() );
+aType = aType.copy( aPrefix.getLength() );
PresObjKind eObjKind = PRESOBJ_NONE;
-if( aType.EqualsAscii( "TitleTextShape" ) )
+if( aType == "TitleTextShape" )
{
eObjKind = PRESOBJ_TITLE;
}
-else if( aType.EqualsAscii( "OutlinerShape" ) )
+else if( aType == "OutlinerShape" )
{
eObjKind = PRESOBJ_OUTLINE;
}
-else if( aType.E
[Libreoffice-commits] core.git: 2 commits - editeng/source sd/source
editeng/source/editeng/impedit4.cxx |5 -
sd/source/ui/inc/filedlg.hxx|3 ---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 03737426620f570e33b93f92a4bd4e4b6d2deba3
Author: Ivan Timofeev
Date: Tue Sep 3 10:25:24 2013 +0400
fix string conversion
regression from 710f41b7aec8e7d35a0da8be332aa289f98942af
Change-Id: I7c5e41294e072eceb036a24397fbb899a568587c
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index e746a14..946391b 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -127,7 +127,10 @@ EditPaM ImpEditEngine::ReadText( SvStream& rInput,
EditSelection aSel )
bool bDone = rInput.ReadByteStringLine( aTmpStr, rInput.GetStreamCharSet()
);
while ( bDone )
{
-aTmpStr = aTmpStr.copy(0, MAXCHARSINPARA );
+if (aTmpStr.getLength() > MAXCHARSINPARA)
+{
+aTmpStr = aTmpStr.copy(0, MAXCHARSINPARA);
+}
aPaM = ImpInsertText( EditSelection( aPaM, aPaM ), aTmpStr );
aPaM = ImpInsertParaBreak( aPaM );
bDone = rInput.ReadByteStringLine( aTmpStr, rInput.GetStreamCharSet()
);
commit a5e59d4509b145f02993d85fa6de9afd5bf8a122
Author: Ivan Timofeev
Date: Tue Sep 3 09:59:21 2013 +0400
remove stray method declaration
Change-Id: Ia536eadc80a969ce16f5d9fb995adfab048b77c1
diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx
index d6fab5e..ebef74e 100644
--- a/sd/source/ui/inc/filedlg.hxx
+++ b/sd/source/ui/inc/filedlg.hxx
@@ -21,7 +21,6 @@
#ifndef _FILEDLG_HXX
#define _FILEDLG_HXX
-#include
#include
#include
@@ -54,8 +53,6 @@ public:
ErrCode Execute();
OUString GetPath() const;
void SetPath( const OUString& rPath );
-
-String ReqDisplayDirectory() const;
};
#endif // _FILEDLG_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - basctl/source cui/uiconfig include/basic officecfg/registry sd/source
basctl/source/basicide/baside2.hxx |4 +-
basctl/source/basicide/baside2b.cxx |8 ++---
cui/uiconfig/ui/optbasicidepage.ui |4 +-
include/basic/codecompletecache.hxx |4 +-
officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs |2 -
sd/source/ui/inc/custsdlg.hxx|2 -
sd/source/ui/inc/fuconuno.hxx|2 -
sd/source/ui/unoidl/unolayer.cxx | 16 +--
sd/source/ui/unoidl/unolayer.hxx |4 +-
9 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 33dd0bcae811bcc7061f6c94b378384f2691d71c
Author: Ivan Timofeev
Date: Tue Sep 3 12:37:56 2013 +0400
String->OUString
Change-Id: I5708992ce73edd96f030ee7bfd5fcd9e0e6fca8a
diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index a97143b..1c6e167 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -83,7 +83,7 @@ private:
SdDrawDocument& rDoc;
SdCustomShow*& rpCustomShow;
sal_BoolbModified;
-String aOldName;
+OUStringaOldName;
voidCheckState();
voidCheckCustomShow();
diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx
index 193d4c0..11adbf9 100644
--- a/sd/source/ui/inc/fuconuno.hxx
+++ b/sd/source/ui/inc/fuconuno.hxx
@@ -56,7 +56,7 @@ protected:
SdDrawDocument* pDoc,
SfxRequest& rReq);
-String aOldLayer;
+OUString aOldLayer;
private:
sal_uInt32 nInventor;
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index fbf14f5..41e3854 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -80,7 +80,7 @@ const SvxItemPropertySet* ImplGetSdLayerPropertySet()
return &aSDLayerPropertySet_Impl;
}
-String SdLayer::convertToInternalName( const OUString& rName )
+OUString SdLayer::convertToInternalName( const OUString& rName )
{
if ( rName == sUNO_LayerName_background )
{
@@ -104,11 +104,11 @@ String SdLayer::convertToInternalName( const OUString&
rName )
}
else
{
-return String( rName );
+return rName;
}
}
-OUString SdLayer::convertToExternalName( const String& rName )
+OUString SdLayer::convertToExternalName( const OUString& rName )
{
if( rName == SD_RESSTR( STR_LAYER_BCKGRND ) )
{
@@ -132,7 +132,7 @@ OUString SdLayer::convertToExternalName( const String&
rName )
}
else
{
-return OUString( rName );
+return rName;
}
}
@@ -317,7 +317,7 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw()
if(pSdrPageView)
{
-String aLayerName = pLayer->GetName();
+OUString aLayerName = pLayer->GetName();
switch(what)
{
case VISIBLE: return pSdrPageView->IsLayerVisible(aLayerName);
@@ -354,7 +354,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag )
throw()
if(pSdrPageView)
{
-String aLayerName(pLayer->GetName());
+OUString aLayerName(pLayer->GetName());
switch(what)
{
case VISIBLE: pSdrPageView->SetLayerVisible(aLayerName,flag);
@@ -525,10 +525,10 @@ uno::Reference< drawing::XLayer > SAL_CALL
SdLayerManager::insertNewByIndex( sal
SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin();
sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount();
sal_Int32 nLayer = nLayerCnt - 2 + 1;
-String aLayerName;
+OUString aLayerName;
// Test for existing names
-while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName,
sal_False) )
+while( aLayerName.isEmpty() || rLayerAdmin.GetLayer( aLayerName,
sal_False) )
{
aLayerName = SD_RESSTR(STR_LAYER);
aLayerName += OUString::number(nLayer);
diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx
index 2208802..6d1ca39 100644
--- a/sd/source/ui/unoidl/unolayer.hxx
+++ b/sd/source/ui/unoidl/unolayer.hxx
@@ -54,8 +54,8 @@ public:
// intern
SdrLayer* GetSdrLayer() const throw() { return pLayer; }
-static String convertToInternalName( const OUString& rName );
-static OUString convertToExternalName( const String& rName );
+static OUString convertToInternalName( const OUString& rName );
+static OUString convertToExternalName( const OUString& rName );
// uno helper
UNO3_GETIMPLEMENTATION_DECL( SdLayer )
commit b0184ebaa4dcc2ad2eb2a258e21212e9e4a74175
Author: Ivan Timofeev
Date: Tue Sep 3 12:36:49 2013 +0400
completition->completion :)
Change-Id: I7a5
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/css1atr.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a8865e5df62b5f33aa769d459b9823eb5b110d4b
Author: Ivan Timofeev
Date: Tue Sep 3 18:00:11 2013 +0400
fix html export of SfxPoolItems
hintids.hxx and SwAttrFnTab were out of sync => wrong functions were called.
regression from 288bcd68bdccd7a57b2c6da2c0bb91b71e8fcd3b
Change-Id: I2a8a68178249f6a4a8a82f38960b046850f7368b
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index bd77d3c..308f46f 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3682,6 +3682,7 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_PARATR_CONNECT_TO_BORDER */ 0, // new
/* RES_PARATR_OUTLINELEVEL */ 0, // new since cws outlinelevel
/* RES_PARATR_RSID */ 0, // new
+/* RES_PARATR_GRABBAG */0,
/* RES_PARATR_LIST_ID */0, // new
/* RES_PARATR_LIST_LEVEL */ 0, // new
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/css1atr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3103306f4753f546f881cfc6bcdb357d4e1857d8
Author: Ivan Timofeev
Date: Tue Sep 3 18:57:42 2013 +0400
fix html export of line spacing
regression from 84931eb8aeeb55a2570edb24f5c2d3409f9c2398
Change-Id: Ifcedcd34721a1ca162495f57ad36cfc6859ab0c4
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 308f46f..4fae564 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2866,7 +2866,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt,
const SfxPoolItem& rHt )
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, (long)nHeight );
else if( nPrcHeight )
{
-OString sHeight(OString(nPrcHeight) + "%");
+OString sHeight(OString::number(nPrcHeight) + "%");
rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_line_height, sHeight);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/filter/html/css1atr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3d0f56a10fbbe6e4c86248ff763f4c3806c7b387
Author: Ivan Timofeev
Date: Tue Sep 3 18:57:42 2013 +0400
fix html export of line spacing
regression from 84931eb8aeeb55a2570edb24f5c2d3409f9c2398
Change-Id: Ifcedcd34721a1ca162495f57ad36cfc6859ab0c4
(cherry picked from commit 3103306f4753f546f881cfc6bcdb357d4e1857d8)
Reviewed-on: https://gerrit.libreoffice.org/5791
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 5a348e4..b791c6500 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2899,7 +2899,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt,
const SfxPoolItem& rHt )
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, (long)nHeight );
else if( nPrcHeight )
{
-OString sHeight(OString(nPrcHeight) + "%");
+OString sHeight(OString::number(nPrcHeight) + "%");
rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_line_height, sHeight);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
libcmis compile failure
Hi, currently some tinderboxes are red. It seems libcmis encounters a bug in boost<=1.49: https://svn.boost.org/trac/boost/ticket/6785 "read_json does not compile on GCC 4.7.0 with std=c++11". Quoting the report: "It compiles successfully on 4.7.0 with -std=c++98". So, should we add this flag for libcmis? Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libcmis compile failure
On 04.09.2013 19:50, Miklos Vajna wrote: > On Wed, Sep 04, 2013 at 06:16:16PM +0400, Ivan Timofeev > wrote: >> Quoting the report: "It compiles successfully on 4.7.0 with >> -std=c++98". >> >> So, should we add this flag for libcmis? > > Hmm, but we bundle boost 1.54. What's the point of using system > boost, but internal libcmis? A wish to build with as much system libraries as possible maybe. :) We require quite recent libcmis >= 0.4.0. Also there is: AC_MSG_ERROR([--with-system-libcmis conflicts with --enable-dbgutil]) Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sd/source svx/source
sd/source/core/drawdoc3.cxx | 85 ++
sd/source/filter/html/htmlex.cxx |3 -
sd/source/filter/html/pubdlg.cxx | 44 ---
sd/source/filter/sdpptwrp.cxx |2
sd/source/filter/xml/sdxmlwrp.cxx |4 -
svx/source/tbxctrls/tbcontrl.cxx |2
6 files changed, 59 insertions(+), 81 deletions(-)
New commits:
commit 1d0e18703523139e5fd6d11b6f3d72bb0b368036
Author: Ivan Timofeev
Date: Sat Sep 14 09:16:28 2013 +0400
fdo#68874: Highlighter icon doesn't change color if no text is selected
the problem is that bChoiceFromPalette becomes false too early when
StateChanged
is called with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (we don't handle it
in the
switch) and the following call with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND
(which
we actually want to handle) is no-op.
Change-Id: I024f6a443535411648bda44576e838c3d863e7de
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 9c6b63e..2a254065 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2537,7 +2537,7 @@ void SvxColorExtToolBoxControl::StateChanged(
{
const SvxColorItem* pItem = 0;
-if ( bChoiceFromPalette )
+if ( bChoiceFromPalette && nSID == GetSlotId() )
{
bChoiceFromPalette = sal_False;
switch( nSID )
commit 501dc6c1debaac98d7f5375bfff80a4709172297
Author: Ivan Timofeev
Date: Sun Sep 8 18:58:27 2013 +0400
String->OUString
Change-Id: Ic69c3372ebbcbd74e57082066221ee9ef0d49d22
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 4f51b84..ec2fee2 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -147,7 +147,7 @@ static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc,
SdDrawDocument* pBoo
else
{
// fetch nPos'th entry from bookmark list, and determine master
page
-String aBMPgName(rBookmarkList[nPos]);
+OUString aBMPgName(rBookmarkList[nPos]);
sal_Bool bIsMasterPage;
sal_uInt16 nBMPage = pBookmarkDoc->GetPageByName( aBMPgName,
bIsMasterPage );
@@ -183,7 +183,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium&
rMedium)
{
sal_Bool bOK = sal_True;
SdDrawDocument* pBookmarkDoc = NULL;
-String aBookmarkName = rMedium.GetName();
+OUString aBookmarkName = rMedium.GetName();
const SfxFilter* pFilter = rMedium.GetFilter();
if ( !pFilter )
{
@@ -195,7 +195,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium&
rMedium)
{
bOK = sal_False;
}
-else if ( maBookmarkFile != aBookmarkName && aBookmarkName.Len() )
+else if ( !aBookmarkName.isEmpty() && maBookmarkFile != aBookmarkName )
{
sal_Bool bCreateGraphicShell = pFilter->GetServiceName() ==
"com.sun.star.drawing.DrawingDocument";
sal_Bool bCreateImpressShell = pFilter->GetServiceName() ==
"com.sun.star.presentation.PresentationDocument";
@@ -222,7 +222,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium&
rMedium)
}
}
-DBG_ASSERT(aBookmarkName.Len(), "Empty document name!");
+DBG_ASSERT(!aBookmarkName.isEmpty(), "Empty document name!");
if (!bOK)
{
@@ -281,17 +281,14 @@ sal_Bool SdDrawDocument::InsertBookmark(
else
{
SdDrawDocument* pBookmarkDoc = NULL;
-String aBookmarkName;
if (pBookmarkDocSh)
{
pBookmarkDoc = pBookmarkDocSh->GetDoc();
-aBookmarkName = pBookmarkDocSh->GetMedium()->GetName();
}
else if ( mxBookmarkDocShRef.Is() )
{
pBookmarkDoc = mxBookmarkDocShRef->GetDoc();
-aBookmarkName = maBookmarkFile;
}
else
bOK = sal_False;
@@ -300,10 +297,8 @@ sal_Bool SdDrawDocument::InsertBookmark(
for ( pIter = rBookmarkList.begin(); bOK && pIter !=
rBookmarkList.end() && !bInsertPages; ++pIter )
{
// Is there a page name in the bookmark list?
-String aBMPgName(*pIter);
sal_BoolbIsMasterPage;
-
-if( pBookmarkDoc->GetPageByName( aBMPgName, bIsMasterPage ) !=
SDRPAGE_NOTFOUND )
+if( pBookmarkDoc->GetPageByName( *pIter, bIsMasterPage ) !=
SDRPAGE_NOTFOUND )
{
// Found the page
bInsertPages = sal_True;
@@ -368,7 +363,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
sal_uInt16 nReplacedStandardPages = 0;
SdDrawDocument* pBookmarkDoc = NULL;
-String aBookmarkName;
+OUString aBookmarkName;
if (pBookmarkDocSh)
{
@@ -439,7 +434,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
pBMPage->GetUppBorder() != pRefPage->Get
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/tbxctrls/tbcontrl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 053e4635d816cb18a6098a58f6d275417a244ac0
Author: Ivan Timofeev
Date: Sat Sep 14 09:16:28 2013 +0400
fdo#68874: Highlighter icon doesn't change color if no text is selected
the problem is that bChoiceFromPalette becomes false too early when
StateChanged
is called with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (we don't handle it
in the
switch) and the following call with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND
(which
we actually want to handle) is no-op.
Change-Id: I024f6a443535411648bda44576e838c3d863e7de
(cherry picked from commit 1d0e18703523139e5fd6d11b6f3d72bb0b368036)
Reviewed-on: https://gerrit.libreoffice.org/5942
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e58ddae..62f2ee2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2545,7 +2545,7 @@ void SvxColorExtToolBoxControl::StateChanged(
{
const SvxColorItem* pItem = 0;
-if ( bChoiceFromPalette )
+if ( bChoiceFromPalette && nSID == GetSlotId() )
{
bChoiceFromPalette = sal_False;
switch( nSID )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/tbxctrls/tbcontrl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 95dfcdcf7710a2b384d3ef8a94443efee86eb701
Author: Ivan Timofeev
Date: Sat Sep 14 09:16:28 2013 +0400
fdo#68874: Highlighter icon doesn't change color if no text is selected
the problem is that bChoiceFromPalette becomes false too early when
StateChanged
is called with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (we don't handle it
in the
switch) and the following call with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND
(which
we actually want to handle) is no-op.
Change-Id: I024f6a443535411648bda44576e838c3d863e7de
(cherry picked from commit 1d0e18703523139e5fd6d11b6f3d72bb0b368036)
Reviewed-on: https://gerrit.libreoffice.org/5941
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 112ef1f..94a3ebe 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2500,7 +2500,7 @@ void SvxColorExtToolBoxControl::StateChanged(
{
const SvxColorItem* pItem = 0;
-if ( bChoiceFromPalette )
+if ( bChoiceFromPalette && nSID == GetSlotId() )
{
bChoiceFromPalette = sal_False;
switch( nSID )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/tbxctrls/itemwin.cxx | 38 +-
1 file changed, 37 insertions(+), 1 deletion(-)
New commits:
commit 03a341775507502dd58598edc3fd805a8518550d
Author: Ivan Timofeev
Date: Tue Sep 17 16:49:14 2013 +0400
fdo#64455 Handle unknown color in color line
Change-Id: Ice4205056cc64ae50bd3c8136aeae6f648adbd0b
Signed-off-by: Ivan Timofeev
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index dbc2ede..dd44ac7 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -28,6 +28,9 @@
#include
+#define TMP_STR_BEGIN '['
+#define TMP_STR_END ']'
+
#define DELAY_TIMEOUT 100
#include
@@ -295,7 +298,40 @@ SvxColorBox::~SvxColorBox()
void SvxColorBox::Update( const XLineColorItem* pItem )
{
if ( pItem )
-SelectEntry( pItem->GetColorValue() );
+{
+ // fdo#64455
+::Color aColor = pItem->GetColorValue();
+String aString( pItem->GetName() );
+SelectEntry(aString);
+if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ||
+GetSelectEntryColor() != aColor )
+{
+SelectEntry( aColor );
+}
+// Check if the entry is not in the list
+if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ||
+GetSelectEntryColor() != aColor )
+{
+sal_uInt16 nCount = GetEntryCount();
+String aTmpStr;
+if( nCount > 0 )
+{
+// Last entry gets tested against temporary color
+aTmpStr = GetEntry( nCount - 1 );
+if( aTmpStr.GetChar(0) == TMP_STR_BEGIN &&
+ aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END )
+{
+RemoveEntry( nCount - 1 );
+}
+}
+aTmpStr = TMP_STR_BEGIN;
+aTmpStr += aString;
+aTmpStr += TMP_STR_END;
+
+sal_uInt16 nPos = InsertEntry( aColor, aTmpStr );
+SelectEntryPos( nPos );
+}
+}
else
SetNoSelection();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED: master,4-1,4-0] fdo#64455 Handle unknown color in color line toolbox
Hi Laurent, Thanks, I fixed the indentation and pushed it. Sadly I forgot to amend the author while pushing to 4-1 and stole your commit :( sorry for that. Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/docvw/SidebarWin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ddbcb6687722314b37cfda3170596ac7a4f69602
Author: Ivan Timofeev
Date: Tue Sep 17 18:34:17 2013 +0400
fdo#41833: fix visual cursor position after resizing
SetOutputArea updates a cursor position, SetVisArea doesn't => call
SetOutputArea
after SetVisArea.
Change-Id: Ie8f079cb3d567f759c84587a8072b98fab43588b
diff --git a/sw/source/ui/docvw/SidebarWin.cxx
b/sw/source/ui/docvw/SidebarWin.cxx
index 4a0ae75..4cf128a 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -597,11 +597,11 @@ void SwSidebarWin::DoResize()
}
mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ;
-mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight)
) );
if (!mpVScrollbar->IsVisible())
{ // if we do not have a scrollbar anymore, we want to see the complete
text
mpOutlinerView->SetVisArea( PixelToLogic(
Rectangle(0,0,aWidth,aHeight) ) );
}
+mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight)
) );
if (!Application::GetSettings().GetLayoutRTL())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED: master,4-1,4-0] fdo#64455 Handle unknown color in color line toolbox
On 17.09.2013 17:37, Laurent BP [via Document Foundation Mail Archive] wrote: > Moreover, I realized afterwards it may be better to use OUString than > String? I saw many patches proposing to replace String by OUString. Yes, OUString should be used in new code instead of String. You can help with this long-standing conversion btw. :) Regards, Ivan -- View this message in context: http://nabble.documentfoundation.org/PATCH-fdo-64455-Handle-unknown-color-in-color-line-toolbox-tp4074169p4074506.html Sent from the Dev mailing list archive at Nabble.com.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/docvw/SidebarWin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 195ac805ee3350adb5971c90edee3ee8481f41a9
Author: Ivan Timofeev
Date: Tue Sep 17 18:34:17 2013 +0400
fdo#41833: fix visual cursor position after resizing
SetOutputArea updates a cursor position, SetVisArea doesn't => call
SetOutputArea
after SetVisArea.
Change-Id: Ie8f079cb3d567f759c84587a8072b98fab43588b
(cherry picked from commit ddbcb6687722314b37cfda3170596ac7a4f69602)
Reviewed-on: https://gerrit.libreoffice.org/5977
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/docvw/SidebarWin.cxx
b/sw/source/ui/docvw/SidebarWin.cxx
index fa0fed6..b8d150f 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -595,11 +595,11 @@ void SwSidebarWin::DoResize()
}
mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ;
-mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight)
) );
if (!mpVScrollbar->IsVisible())
{ // if we do not have a scrollbar anymore, we want to see the complete
text
mpOutlinerView->SetVisArea( PixelToLogic(
Rectangle(0,0,aWidth,aHeight) ) );
}
+mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight)
) );
if (!Application::GetSettings().GetLayoutRTL())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/ui/docvw/SidebarWin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2da3517dd289e00b98f7f8616a4faa9b00fb8403
Author: Ivan Timofeev
Date: Tue Sep 17 18:34:17 2013 +0400
fdo#41833: fix visual cursor position after resizing
SetOutputArea updates a cursor position, SetVisArea doesn't => call
SetOutputArea
after SetVisArea.
Change-Id: Ie8f079cb3d567f759c84587a8072b98fab43588b
(cherry picked from commit ddbcb6687722314b37cfda3170596ac7a4f69602)
Reviewed-on: https://gerrit.libreoffice.org/5978
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/docvw/SidebarWin.cxx
b/sw/source/ui/docvw/SidebarWin.cxx
index 17c0aea..ca7326b 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -596,11 +596,11 @@ void SwSidebarWin::DoResize()
}
mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ;
-mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight)
) );
if (!mpVScrollbar->IsVisible())
{ // if we do not have a scrollbar anymore, we want to see the complete
text
mpOutlinerView->SetVisArea( PixelToLogic(
Rectangle(0,0,aWidth,aHeight) ) );
}
+mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight)
) );
if (!Application::GetSettings().GetLayoutRTL())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] Convert String to OUString in itemwin.cxx
On 19.09.2013 23:50, Laurent BP [via Document Foundation Mail Archive] wrote: > Here is a new patch to correct my previous one thanks, pushed. -- View this message in context: http://nabble.documentfoundation.org/Re-PUSHED-Convert-String-to-OUString-in-itemwin-cxx-tp4074874.html Sent from the Dev mailing list archive at Nabble.com.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source include/editeng
editeng/source/outliner/outlvw.cxx |7 ---
include/editeng/outliner.hxx | 25 -
2 files changed, 32 deletions(-)
New commits:
commit 6536270e14c1017313d1bd1508d54392c0626696
Author: Ivan Timofeev
Date: Sun Sep 22 20:00:39 2013 +0400
remove unused members from OutlinerView
Change-Id: Iac32c42afef80e01af70479e5b2f9de4e1dfab26
diff --git a/editeng/source/outliner/outlvw.cxx
b/editeng/source/outliner/outlvw.cxx
index 829087d..036b464 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -54,11 +54,6 @@ OutlinerView::OutlinerView( Outliner* pOut, Window* pWin )
DBG_CTOR( OutlinerView, 0 );
pOwner = pOut;
-bDDCursorVisible= sal_False;
-bInDragMode = sal_False;
-nDDScrollLRBorderWidthWin = 0;
-nDDScrollTBBorderWidthWin = 0;
-pHorTabArrDoc = 0;
pEditView = new EditView( pOut->pEditEngine, pWin );
pEditView->SetSelectionMode( EE_SELMODE_TXTONLY );
@@ -348,8 +343,6 @@ sal_Bool OutlinerView::MouseButtonDown( const MouseEvent&
rMEvt )
else if( rMEvt.GetClicks() == 2 && bHasChildren )
ImpToggleExpand( pPara );
-aDDStartPosPix = rMEvt.GetPosPixel();
-aDDStartPosRef=pEditView->GetWindow()->PixelToLogic(
aDDStartPosPix,pOwner->GetRefMapMode());
return sal_True;
}
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 484f08c..3b3f18b 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -186,28 +186,6 @@ private:
Outliner* pOwner;
EditView* pEditView;
-// Drag & Drop
-sal_BoolbBeginDragAtMove_OLDMEMBER;
-sal_BoolbInDragMode;
-Point aDDStartPosRef;
-Point aDDStartPosPix;
-sal_Int32 nDDStartPara;
-sal_Int32 nDDStartParaVisChildCount;
-sal_Int32 nDDCurPara;
-sal_uInt16 nDDStartDepth;
-sal_uInt16 nDDCurDepth;
-sal_uInt16 nDDMaxDepth;
-sal_BoolbDDChangingDepth;
-sal_BoolbDDCursorVisible;
-long* pHorTabArrDoc;
-longnDDScrollLRBorderWidthWin; // Left Right
-longnDDScrollTBBorderWidthWin; // Top Bottom
-longnDDScrollLROffs;
-longnDDScrollTDOffs;
-
-void* pDummy;
-sal_uLong nDummy;
-
enum MouseTarget {
MouseText = 0,
MouseBullet = 1,
@@ -215,7 +193,6 @@ private:
MouseOutside = 3,// Outside OutputArea
MouseDontKnow = 4
};
-MouseTarget OLD_ePrevMouseTarget;
EDITENG_DLLPRIVATE void ImplExpandOrCollaps( sal_Int32 nStartPara,
sal_Int32 nEndPara, sal_Bool bExpand );
@@ -223,11 +200,9 @@ private:
EDITENG_DLLPRIVATE void ImpToggleExpand( Paragraph* pParentPara );
EDITENG_DLLPRIVATE ParaRangeImpGetSelectedParagraphs( sal_Bool
bIncludeHiddenChildren );
-EDITENG_DLLPRIVATE Pointer ImpGetMousePointer( MouseTarget eTarget );
EDITENG_DLLPRIVATE sal_Int32ImpInitPaste( sal_Int32& rStart );
EDITENG_DLLPRIVATE void ImpPasted( sal_Int32 nStart, sal_Int32
nPrevParaCount, sal_Int32 nSize);
EDITENG_DLLPRIVATE sal_Int32ImpCalcSelectedPages( sal_Bool
bIncludeFirstSelected );
-EDITENG_DLLPRIVATE sal_BoolImpIsIndentingPages();
public:
OutlinerView( Outliner* pOut, Window* pWindow );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: cppcheck: duplicate branch for ParaPropertyPanel (svx)
On 28.09.2013 10:57, Ivan Timofeev wrote: > The code itself does not make sense too - > the images are swapped, but the tooltips are not... :) please ignore this brainfart, oh... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: cppcheck: duplicate branch for ParaPropertyPanel (svx)
On 28.09.2013 01:52, julien2412 wrote:
> svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
> 309 duplicateBranch style Found duplicate branches for 'if' and 'else'.
> 328 duplicateBranch style Found duplicate branches for 'if' and 'else'.
> Indeed:
> 309 if( Application::GetSettings().GetLayoutRTL())
> 310 {
> 311 mpTbxIndent_IncDec->SetItemImage(nIdIncrement,
> maIncIndentControl.GetIcon());
> 312 mpTbxIndent_IncDec->SetItemImage(nIdDecrement,
> maDecIndentControl.GetIcon());
> 313 }
> 314 else
> 315 {
> 316 mpTbxIndent_IncDec->SetItemImage(nIdIncrement,
> maIncIndentControl.GetIcon());
> 317 mpTbxIndent_IncDec->SetItemImage(nIdDecrement,
> maDecIndentControl.GetIcon());
> 318 }
>
> (the same for part around line 328)
> See
> http://opengrok.libreoffice.org/xref/core/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx#309
Hi Julien,
The condition does not make sense - it should check for a text
direction, not UI direction. The code itself does not make sense too -
the images are swapped, but the tooltips are not... :)
So you can remove the duplicate branches.
Regards,
Ivan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/cuicharmap.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 3fd01d00c2299aed55d11d59d3b6fdabbab8404b
Author: Ivan Timofeev
Date: Sat Sep 28 21:24:53 2013 +0400
fdo#60896: Double click in Special Characters picker inserts nothing
Change-Id: I9957d720231b3f2ff8e7869c7133fd8e29550e1f
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index fdc4a25..c22a16d 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -502,6 +502,11 @@ IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl)
IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl)
{
+if (bOne)
+{
+sal_UCS4 cChar = m_pShowSet->GetSelectCharacter();
+m_pShowText->SetText(OUString(&cChar, 1));
+}
EndDialog( sal_True );
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: ucb/Library_ucpgio1.mk ucb/source
Hi Stephan,
I have the following error after that commit:
[build CXX] ucb/source/ucp/gio/gio_content.cxx
[build CHK] loaded modules: ucb
In file included from
/home/ivan/libo/master/ucb/source/ucp/gio/gio_content.cxx:65:
In file included from /home/ivan/libo/master/include/vcl/svapp.hxx:31:
/home/ivan/libo/master/include/comphelper/solarmutex.hxx:25:10: fatal
error: 'boost/noncopyable.hpp' file not found
#include "boost/noncopyable.hpp"
^
1 error generated.
I don't know how to fix it.
OS is Ubuntu 13.10, autogen.input is:
CC=clang
CXX=clang++
--without-doxygen
--with-help
--disable-odk
--disable-postgresql-sdbc
--enable-gtk3
--with-system-cairo
--with-lang=en-US ru
Regards,
Ivan
On 27.09.2013 00:31, Stephan Bergmann wrote:
> ucb/Library_ucpgio1.mk |1 +
> ucb/source/ucp/gio/gio_content.cxx | 11 ++-
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> New commits:
> commit 2eb36dc4b846ab5886ae71fd2978b56b2a2d1d08
> Author: Stephan Bergmann
> Date: Thu Sep 26 22:30:11 2013 +0200
>
> Hack to not leave SolarMutex released after g_main_loop_run call
>
> Change-Id: I26923469d08308233ce3fabe749806c16d75cecd
>
> diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk
> index eb39c8e..000f557 100644
> --- a/ucb/Library_ucpgio1.mk
> +++ b/ucb/Library_ucpgio1.mk
> @@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_libraries,ucpgio1,\
> sal \
> salhelper \
> ucbhelper \
> + vcl \
> ))
>
> $(eval $(call gb_Library_use_externals,ucpgio1,\
> diff --git a/ucb/source/ucp/gio/gio_content.cxx
> b/ucb/source/ucp/gio/gio_content.cxx
> index 8621782..f7ce5f9 100644
> --- a/ucb/source/ucp/gio/gio_content.cxx
> +++ b/ucb/source/ucp/gio/gio_content.cxx
> @@ -62,6 +62,7 @@
> #include
> #include
> #include
> +#include
>
> #include
>
> @@ -325,7 +326,15 @@ void MountOperation::Completed(GObject *source,
> GAsyncResult *res, gpointer user
> GError *MountOperation::Mount(GFile *pFile)
> {
> g_file_mount_enclosing_volume(pFile, G_MOUNT_MOUNT_NONE,
> mpAuthentication, NULL, MountOperation::Completed, this);
> -g_main_loop_run(mpLoop);
> +{
> +//HACK: At least the gdk_threads_set_lock_functions(GdkThreadsEnter,
> +// GdkThreadsLeave) call in vcl/unx/gtk/app/gtkinst.cxx will lead to
> +// GdkThreadsLeave unlock the SolarMutex down to zero at the end of
> +// g_main_loop_run, so we need ~SolarMutexReleaser to raise it back
> to
> +// the original value again:
> +SolarMutexReleaser rel;
> +g_main_loop_run(mpLoop);
> +}
> return mpError;
> }
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
resize handling / layout on timeout?
Hi, looking at fdo#38814 "Snappier rendering: paint at idle, not on timeout" https://bugs.freedesktop.org/show_bug.cgi?id=38814 it is not clear to me why we handle resize asynchronously. It was introduced in http://cgit.freedesktop.org/libreoffice/core/commit/?id=fb72a53dc6ff64001cbdebbdd908b7cf71aa8723 "#83524# buffer resize events to handle opaque resize WMs better" only for vcl/unx/generic. Then there was a bug https://issues.apache.org/ooo/show_bug.cgi?id=30571 "VCL plugin: slow painting of help application if main window is resized" - turned out the help app is super-slow on Resize -> the solution was to resize on timer for *all* platforms/vcl plugins: http://cgit.freedesktop.org/libreoffice/core/log/?qt=grep&q=i30571 So - #83524# is dead, I don't know what is "opaque resize WM"... But if there is a problem with the help application only, wouldn't it better to fix *its* resize handling? FWIW, I've disabled the resize timer (i.e. bool bStartTimer = false in vcl/source/window/winproc.cxx) and don't see any problem so far (except the help app). Same for layout - I guess it can be done immediately..? (Well, the printdialog will need some love then). Opinions? Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: resize handling / layout on timeout?
Hi Caolán, On 07.10.2013 17:36, Caolán McNamara wrote: > Opaque resize is the now normal case where window contents are shown > while moving as opposed to old-school drawing a simple empty wireframe > box. OK, thanks. >> FWIW, I've disabled the resize timer (i.e. bool bStartTimer = false in >> vcl/source/window/winproc.cxx) and don't see any problem so far (except >> the help app). >> >> Same for layout - I guess it can be done immediately..? (Well, the >> printdialog will need some love then) > > Is the print dialog ultra slow after that or is there some other > problem ? Oops, my bad, it's alright actually, as it scales the preview in Paint, not Resize. =) > Are you just on Linux or are you able to see what the general situation > is like on Windows/MacOSX too ? I can set up a build environment on Windows (or at least run a daily build), but I don't have a Mac at all. :( So I'll have to upload patches for review on MacOSX. Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/desktops.hxx |1 +
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 12 ++--
vcl/unx/generic/plugadapt/salplug.cxx |3 ++-
vcl/unx/gtk/window/gtksalframe.cxx|9 +++--
4 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit 2e25016289d5f565ba4080625950ef6ca6487d34
Author: Ivan Timofeev
Date: Sun Nov 3 21:59:55 2013 +0400
fdo#70885: disable app menu under Unity
Change-Id: I90ca2f5dd8d2678dff74ae5599e640c9a69aee33
diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx
index f67e8ca..0515cf5 100644
--- a/vcl/inc/unx/desktops.hxx
+++ b/vcl/inc/unx/desktops.hxx
@@ -24,6 +24,7 @@ enum DesktopType {
DESKTOP_NONE, // headless, i.e. no X connection at all
DESKTOP_UNKNOWN, // unknown desktop, simple WM, etc.
DESKTOP_GNOME,
+DESKTOP_UNITY,
DESKTOP_XFCE,
DESKTOP_MATE,
DESKTOP_KDE,
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index f18bf0a..1d5d223 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -291,6 +291,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType
get_desktop_environment()
return DESKTOP_KDE4;
if ( aOver.equalsIgnoreAsciiCase( "gnome" ) )
return DESKTOP_GNOME;
+if ( aOver.equalsIgnoreAsciiCase( "unity" ) )
+return DESKTOP_UNITY;
if ( aOver.equalsIgnoreAsciiCase( "xfce" ) )
return DESKTOP_XFCE;
if ( aOver.equalsIgnoreAsciiCase( "mate" ) )
@@ -351,12 +353,18 @@ DESKTOP_DETECTOR_PUBLIC DesktopType
get_desktop_environment()
const char *pSession;
OString aDesktopSession;
-
if ( ( pSession = getenv( "DESKTOP_SESSION" ) ) )
aDesktopSession = OString( pSession, strlen( pSession ) );
+const char *pDesktop;
+OString aCurrentDesktop;
+if ( ( pDesktop = getenv( "XDG_CURRENT_DESKTOP" ) ) )
+aCurrentDesktop = OString( pDesktop, strlen( pDesktop ) );
+
// fast environment variable checks
-if ( aDesktopSession.equalsIgnoreAsciiCase( "gnome" ) )
+if ( aCurrentDesktop.equalsIgnoreAsciiCase( "unity" ) )
+ret = DESKTOP_UNITY;
+else if ( aDesktopSession.equalsIgnoreAsciiCase( "gnome" ) )
ret = DESKTOP_GNOME;
else if ( aDesktopSession.equalsIgnoreAsciiCase( "mate" ) )
ret = DESKTOP_MATE;
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index ddd0422..56d9fe5 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -184,6 +184,7 @@ static SalInstance* autodetect_plugin()
if ( desktop == DESKTOP_NONE )
pList = pHeadlessFallbackList;
else if ( desktop == DESKTOP_GNOME ||
+ desktop == DESKTOP_UNITY ||
desktop == DESKTOP_XFCE ||
desktop == DESKTOP_MATE )
pList = pStandardFallbackList;
@@ -286,7 +287,7 @@ const OUString& SalGetDesktopEnvironment()
{
// Order to match desktops.hxx' DesktopType
static const char * const desktop_strings[] = {
-"none", "unknown", "GNOME",
+"none", "unknown", "GNOME", "UNITY",
"XFCE", "MATE", "TDE",
"KDE", "KDE4" };
static OUString aRet;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 58d402c..5651dcf 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -656,7 +656,6 @@ gboolean ensure_dbus_setup( gpointer data )
gdk_x11_window_set_utf8_property( gdkWindow,
"_GTK_APPLICATION_OBJECT_PATH", "/org/libreoffice" );
gdk_x11_window_set_utf8_property( gdkWindow,
"_GTK_WINDOW_OBJECT_PATH", aDBusWindowPath );
gdk_x11_window_set_utf8_property( gdkWindow,
"_GTK_MENUBAR_OBJECT_PATH", aDBusMenubarPath );
-gdk_x11_window_set_utf8_property( gdkWindow,
"_GTK_APP_MENU_OBJECT_PATH", "/org/libreoffice/menus/appmenu" );
// Publish the menu model and the action group.
SAL_INFO("vcl.unity", "exporting menu model at " << pMenuModel << "
for window " << windowId);
@@ -665,9 +664,15 @@ gboolean ensure_dbus_setup( gpointer data )
pSalFrame->m_nActionGroupExportId =
g_dbus_connection_export_action_group( pSessionBus, aDBusWindowPath,
pActionGroup, NULL);
pSalFrame->m_nHudAwarenessId = hud_awareness_register( pSessionBus,
aDBusMenubarPath, hud_activated, pSalFrame, NULL, NULL );
+// fdo#70885 we don't want app menu under Unity
+
[Libreoffice-commits] core.git: sc/source
sc/source/ui/cctrl/checklistmenu.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0340125f912294c76ab409480f5aadecf8aada04
Author: Ivan Timofeev
Date: Tue Nov 5 21:50:34 2013 +0400
fdo#71120: use native checkbox height
Change-Id: I5d112660015f993856b0709f6a5db2baf521d745
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 30b4b0c..2cde8eb 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -970,7 +970,7 @@ void ScCheckListMenuWindow::getSectionPosSize(
break;
case CHECK_TOGGLE_ALL:
{
-long h = nLabelHeight*3/2; // check box height is heuristically
150% of the text height.
+long h = std::min(maChkToggleAll.CalcMinimumSize().Height(), 26L);
rPos = Point(nListBoxMargin, nSingleBtnAreaY);
rPos.X() += 5;
rPos.Y() += (nSingleItemBtnAreaHeight - h)/2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/3434/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/09/309/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/5469/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/15/6615/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/16/6616/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/1143/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/2341/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/2341/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
