[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
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/324/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/89/389/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/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/97/1297/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/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/15/5315/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/72/5172/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/30/230/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/67/467/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/11/5111/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/42/5942/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/15/5315/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/28/628/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/42/5942/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/38/1238/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/25/5725/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/11/5111/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/72/5172/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/44/5744/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/44/5744/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/5941/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/21/4621/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/21/4621/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/03/5503/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/95/895/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/88/388/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/54/5154/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/22/4622/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/27/5727/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/27/5727/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/28/628/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/97/897/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/72/472/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/72/472/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/5741/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/54/5154/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/79/279/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/78/5978/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/88/388/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/5741/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/08/1008/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/78/5978/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/74/474/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/77/5977/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/10/5310/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/77/5977/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/10/5310/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[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 timofeev@gmail.com
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::minsal_Int32(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 timofeev@gmail.com
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 vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
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::minsal_Int32(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 timofeev@gmail.com
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 vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
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: sc/source
sc/source/ui/cctrl/checklistmenu.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0340125f912294c76ab409480f5aadecf8aada04
Author: Ivan Timofeev timofeev@gmail.com
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: 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 timofeev@gmail.com
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
+bool bDesktopIsUnity = (SalGetDesktopEnvironment() == UNITY);
+
+if (!bDesktopIsUnity)
+gdk_x11_window_set_utf8_property( gdkWindow,
_GTK_APP_MENU_OBJECT_PATH, /org/libreoffice/menus/appmenu );
+
//app menu, to-do translations, block normal menus when active, honor
use appmenu settings
ResMgr* pMgr = ImplGetResMgr();
-if( pMgr )
+if( pMgr
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
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=grepq=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: [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 sberg...@redhat.com
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 ucbhelper/propertyvalueset.hxx
#include ucbhelper/interactionrequest.hxx
#include ucbhelper/cancelcommandexecution.hxx
+#include vcl/svapp.hxx
#include osl/conditn.hxx
@@ -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
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 timofeev@gmail.com
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
[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 timofeev@gmail.com
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: [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: 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 timofeev@gmail.com
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 caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
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 timofeev@gmail.com
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 caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
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
[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 timofeev@gmail.com
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 caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
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 timofeev@gmail.com
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 timofeev@gmail.com
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 svx/dialogs.hrc
+#define TMP_STR_BEGIN '['
+#define TMP_STR_END ']'
+
#define DELAY_TIMEOUT 100
#include svx/xlnclit.hxx
@@ -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 timofeev@gmail.com
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' - svx/source
svx/source/tbxctrls/tbcontrl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 053e4635d816cb18a6098a58f6d275417a244ac0
Author: Ivan Timofeev timofeev@gmail.com
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 vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
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: 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 timofeev@gmail.com
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 timofeev@gmail.com
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-GetUppBorder()||
pBMPage-GetLwrBorder() != pRefPage-GetLwrBorder())
{
-String aStr(SdResId(STR_SCALE_OBJECTS
[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 timofeev@gmail.com
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 caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
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 timofeev@gmail.com 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: 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 timofeev@gmail.com
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 timofeev@gmail.com
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 tools/string.hxx
#include tools/errcode.hxx
#include memory
@@ -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 timofeev@gmail.com
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 timofeev@gmail.com
Date: Tue Sep 3 12:36:49 2013 +0400
completition-completion :)
Change-Id: I7a5ae7cc0d6a253bbc27db076babedd65c89be1a
diff --git a/basctl/source/basicide/baside2
[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 timofeev@gmail.com
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 timofeev@gmail.com
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: 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 timofeev@gmail.com
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.EqualsAscii( SubtitleShape ) )
+else if( aType == SubtitleShape )
{
eObjKind = PRESOBJ_TEXT;
}
-else if( aType.EqualsAscii
[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 timofeev@gmail.com 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
[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 timofeev@gmail.com 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 caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com 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
[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 timofeev@gmail.com 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 caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com 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
[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 timofeev@gmail.com
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::SetEditText( String const rStr )
+void SdTPAction::SetEditText( OUString const rStr )
{
presentation::ClickAction eCA
[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 timofeev@gmail.com 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 caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com 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 @@ value xml:lang=en-USOutline to ~Clipboard/value /prop /node - node oor:name=.uno:FlipVertical oor:op=replace -prop oor:name=Label oor:type=xs:string - value xml:lang=en-USFlip Horizontally/value -/prop -prop oor:name=Properties oor:type=xs:int - value1/value -/prop - /node node oor:name=.uno:RotateLeft oor:op=replace prop oor:name=Label oor:type=xs:string value xml:lang=en-USRotate 90° ~Left/value ___ 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 timofeev@gmail.com 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 caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com 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
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
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=coredefs=SvxLineColorToolBoxControlrefs=path=hist= Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[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 timofeev@gmail.com 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 @@ /node node oor:name=.uno:FontworkGalleryFloater oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USFontwork Gallery/value + value xml:lang=en-USFontwork Gallery.../value /prop prop oor:name=Properties oor:type=xs:int value9/value 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 @@ menu:menu menu:id=.uno:GraphicMenu menu:menupopup menu:menuitem menu:id=.uno:InsertGraphic/ +menu:menuitem menu:id=.uno:FontworkGalleryFloater/ /menu:menupopup /menu:menu menu:menu menu:id=.uno:ObjectMenu 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 @@ menu:menuitem menu:id=.uno:TwainTransfer/ /menu:menupopup /menu:menu + menu:menuitem menu:id=.uno:FontworkGalleryFloater/ /menu:menupopup /menu:menu menu:menuitem menu:id=.uno:InsertTable/ 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 @@ menu:menuitem menu:id=.uno:TwainTransfer/ /menu:menupopup /menu:menu +menu:menuitem menu:id=.uno:FontworkGalleryFloater/ /menu:menupopup /menu:menu menu:menuitem menu:id=.uno:InsertTable/ 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 @@ menu:menuitem menu:id=.uno:TwainTransfer/ /menu:menupopup /menu:menu + menu:menuitem menu:id=.uno:FontworkGalleryFloater/ /menu:menupopup /menu:menu menu:menuitem menu:id=.uno:InsertAVMedia/ 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 @@ menu:menuitem menu:id=.uno:TwainTransfer/ /menu:menupopup /menu:menu + menu:menuitem menu:id=.uno:FontworkGalleryFloater/ /menu:menupopup /menu:menu menu:menuitem menu:id=.uno:InsertAVMedia/ 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 @@ menu:menuitem menu:id=.uno:TwainTransfer/ /menu:menupopup /menu:menu + menu:menuitem menu:id=.uno:FontworkGalleryFloater/ /menu:menupopup /menu:menu menu:menuitem menu:id=.uno:InsertAVMedia/ 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
[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 timofeev@gmail.com
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::vectorString rPageNames, SdCustomShowList* pCSList ) = 0;
+ const
std::vectorOUString 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() ) );
pEntry-AddItem( new SvLBoxContextBmp( pEntry, 0, Image
[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 timofeev@gmail.com
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: 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 timofeev@gmail.com 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 caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com 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 @@ /desc labelDefines the number of columns that will be shown in a ColorValueSet./label /info -value8/value +value12/value /prop prop oor:name=PreviewUsesCheckeredBackground oor:type=xs:boolean info ___ 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 timofeev@gmail.com
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: svx/source
svx/source/dialog/charmap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b12e0b522b7f13d15d2ce41dc1e7c0159d53
Author: Ivan Timofeev timofeev@gmail.com
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 timofeev@gmail.com
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 caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
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
