[Libreoffice-commits] core.git: Changes to 'refs/changes/51/1951/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/73/1873/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/57/1857/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/73/1873/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/51/1951/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/58/1958/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/58/1958/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/57/1857/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/1888/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/57/1957/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/57/1957/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/87/1887/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/1874/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/74/1874/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/1910/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/50/1950/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/50/1950/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/70/7770/3'
___ 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/70/7770/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/13/2013/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/13/2013/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/backingwindow.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit e5b654a056d407cf8db975ee8042a0328627d4d8 Author: Robert Roth Date: Sat Feb 1 01:10:37 2014 +0200 fdo#64337 Do not show empty findbar in startcenter. Using the shortcut for search on the start center displayed an empty toolbar on the start center. This commit adds a check to see whether the command to execute in the startcenter is FocusToFindbar, and if it is, it skips executing it. Change-Id: I0835e87d4a1eef0fc9ff17c184b531592b3e2d5a diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 70605d8..5f849cd 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -355,7 +355,8 @@ bool BackingWindow::Notify( NotifyEvent& rNEvt ) } const KeyEvent* pEvt = rNEvt.GetKeyEvent(); const KeyCode& rKeyCode(pEvt->GetKeyCode()); -if( pEvt && mpAccExec->execute(rKeyCode) ) +const OUString aCommand = mpAccExec->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rKeyCode)); +if((aCommand != "vnd.sun.star.findbar:FocusToFindbar") && pEvt && mpAccExec->execute(rKeyCode)) return true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Show character count with word count in writer statusbar, fd...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2013
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/2013/1
Show character count with word count in writer statusbar, fdo#59962
Change-Id: I65f9ce6bc9851c97e25aaf5b131a4b319f00fed0
---
M sw/source/ui/app/app.src
M sw/source/ui/uiview/view2.cxx
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 4bf6801..38f114f 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -594,12 +594,12 @@
String STR_STATUSBAR_WORDCOUNT_NO_SELECTION
{
-Text [ en-US ] = "Words: $1";
+Text [ en-US ] = "Words (characters): $1 ($2)";
};
String STR_STATUSBAR_WORDCOUNT
{
-Text [ en-US ] = "Words: $1 Selected: $2";
+Text [ en-US ] = "Words (characters): $1 ($2) Selected: $3 ($4)";
};
String STR_CONVERT_TEXT_TABLE
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 33266ad..f5aff2a 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1247,9 +1247,11 @@
const sal_uInt32 stringId = selectionStats.nWord?
STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION;
rtl::OUString wordCount(SW_RES(stringId));
wordCount = wordCount.replaceAll("$1",
OUString::number(documentStats.nWord));
+wordCount = wordCount.replaceAll("$2",
OUString::number(documentStats.nChar));
if (selectionStats.nWord)
{
-wordCount = wordCount.replaceAll("$2",
OUString::number(selectionStats.nWord));
+wordCount = wordCount.replaceAll("$3",
OUString::number(selectionStats.nWord));
+wordCount = wordCount.replaceAll("$4",
OUString::number(selectionStats.nChar));
}
rSet.Put(SfxStringItem(FN_STAT_WORDCOUNT, wordCount));
--
To view, visit https://gerrit.libreoffice.org/2013
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65f9ce6bc9851c97e25aaf5b131a4b319f00fed0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Robert Roth
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/app/app.src |4 ++--
sw/source/ui/uiview/view2.cxx |4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 947041e1ab4de4723c537eebd37421d929836700
Author: Robert Roth
Date: Wed Feb 6 01:36:54 2013 +0200
Show character count with word count in writer statusbar, fdo#59962
Change-Id: I65f9ce6bc9851c97e25aaf5b131a4b319f00fed0
Reviewed-on: https://gerrit.libreoffice.org/2013
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 4bf6801..38f114f 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -594,12 +594,12 @@ String STR_OUTLINE_NUMBERING
String STR_STATUSBAR_WORDCOUNT_NO_SELECTION
{
-Text [ en-US ] = "Words: $1";
+Text [ en-US ] = "Words (characters): $1 ($2)";
};
String STR_STATUSBAR_WORDCOUNT
{
-Text [ en-US ] = "Words: $1 Selected: $2";
+Text [ en-US ] = "Words (characters): $1 ($2) Selected: $3 ($4)";
};
String STR_CONVERT_TEXT_TABLE
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 33266ad..f5aff2a 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1247,9 +1247,11 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
const sal_uInt32 stringId = selectionStats.nWord?
STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION;
rtl::OUString wordCount(SW_RES(stringId));
wordCount = wordCount.replaceAll("$1",
OUString::number(documentStats.nWord));
+wordCount = wordCount.replaceAll("$2",
OUString::number(documentStats.nChar));
if (selectionStats.nWord)
{
-wordCount = wordCount.replaceAll("$2",
OUString::number(selectionStats.nWord));
+wordCount = wordCount.replaceAll("$3",
OUString::number(selectionStats.nWord));
+wordCount = wordCount.replaceAll("$4",
OUString::number(selectionStats.nChar));
}
rSet.Put(SfxStringItem(FN_STAT_WORDCOUNT, wordCount));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/uiconfig vcl/uiconfig
cui/uiconfig/ui/charnamepage.ui |4 vcl/uiconfig/ui/printdialog.ui | 15 +-- 2 files changed, 17 insertions(+), 2 deletions(-) New commits: commit d8675086874694543e2bc1b32bee3407936a9132 Author: Robert Roth Date: Fri Feb 1 00:09:17 2013 +0200 Added 6 pixel vertical spacing on the Font tab, fdo#59846 Change-Id: I61c85b75b026e15541101b25cf254aa64c3e1762 Reviewed-on: https://gerrit.libreoffice.org/1949 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index b2f4736..9ab5b02 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -24,6 +24,7 @@ False True True +6 6 @@ -226,6 +227,7 @@ False True True +6 6 @@ -412,6 +414,7 @@ False True True +6 6 @@ -598,6 +601,7 @@ False True True +6 6 commit 2d8c637e9f1b3910205b49c3494c070e3ac5bc6a Author: Robert Roth Date: Fri Feb 1 00:12:43 2013 +0200 Added dialog title, 6 px spacing on Print dialog like in 3.6, fdo#59846 Change-Id: Id7c9ff4c7d7da830f9fdfb5046b627b5235c19be Reviewed-on: https://gerrit.libreoffice.org/1951 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index ae1f41f..4ef0a6b 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -23,6 +23,7 @@ False 5 +Print dialog @@ -207,6 +208,7 @@ False True True +6 True @@ -383,7 +385,8 @@ True False -7 +6 +6 True @@ -402,6 +405,7 @@ True False vertical +6 True @@ -497,12 +501,14 @@ True False vertical +6 True False 6 vertical +6 All sheets @@ -578,6 +584,7 @@ False 6 vertical +6 All pages @@ -773,7 +780,7 @@ True False vertical -3 +6 True @@ -943,6 +950,7 @@ True False +6 7 @@ -1289,6 +1297,8 @@ True False +6 +6 12 @@ -1370,6 +1380,7 @@ True False +6 Print to file ___ Libreoffice-commits mailing list libreoffice-comm
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/effectspage.ui | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) New commits: commit 77ca9375c4248cac1aafd7112ef895edc9d96b6f Author: Robert Roth Date: Fri Feb 1 00:10:31 2013 +0200 Added 6 pixel vertical spacing on the Font effects tab, fdo#59846 Change-Id: Id1cd40e3b9e2ae9ba0193708245c62f8ecd9cb96 Reviewed-on: https://gerrit.libreoffice.org/1950 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui index 4fd6862..9ae0686 100644 --- a/cui/uiconfig/ui/effectspage.ui +++ b/cui/uiconfig/ui/effectspage.ui @@ -214,6 +214,7 @@ True False +6 6 @@ -431,11 +432,9 @@ Outline -False True True False -False 0 True True @@ -450,11 +449,9 @@ Shadow -False True True False -False 0 True True @@ -469,11 +466,9 @@ Blinking -False True True False -False 0 True True @@ -488,11 +483,9 @@ Hidden -False True True False -False 0 True True @@ -507,11 +500,9 @@ Individual words -False True True False -False 0 True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/services/backingwindow.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 50685e3caf8d27d624a9006d578f686dfbe020c5
Author: Robert Roth
Date: Sat Feb 2 00:50:37 2013 +0200
Start center background color uses application background color, fdo51535
Change-Id: I781ea544e052e775f5cc1d709c5c3a319025ab12
Reviewed-on: https://gerrit.libreoffice.org/1958
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/framework/source/services/backingwindow.cxx
b/framework/source/services/backingwindow.cxx
index d633f87..819ec5e 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -40,6 +40,7 @@
#include "svtools/imagemgr.hxx"
#include "svtools/svtools.hrc"
#include "svtools/langhelp.hxx"
+#include "svtools/colorcfg.hxx"
#include "comphelper/processfactory.hxx"
#include "comphelper/sequenceashashmap.hxx"
@@ -660,7 +661,7 @@ void BackingWindow::layoutButton(
void BackingWindow::Paint( const Rectangle& )
{
-Wallpaper aBack( GetSettings().GetStyleSettings().GetWorkspaceColor() );
+Wallpaper aBack(
svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor );
Region aClip( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
Rectangle aBmpRect(maControlRect);
aBmpRect.Left() -= nShadowLeft;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drviews4.cxx |9 +
sd/source/ui/view/drviews5.cxx |9 +
2 files changed, 2 insertions(+), 16 deletions(-)
New commits:
commit 2d18b593f36c9146bd317b9e62163f8dc078f6b8
Author: Robert Roth
Date: Sat Feb 2 00:05:01 2013 +0200
Use application background consistently in Draw, fdo#59042
Change-Id: I990a88b2726a7fafe8b15179962f004008090c7a
Reviewed-on: https://gerrit.libreoffice.org/1957
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index fe92bc0..c3511c9 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -335,14 +335,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt,
::sd::Window* pWin)
svtools::ColorConfig aColorConfig;
Color aFillColor;
-if(DOCUMENT_TYPE_IMPRESS == GetDoc()->GetDocumentType())
-{
-aFillColor = Color( aColorConfig.GetColorValue(
svtools::APPBACKGROUND ).nColor );
-}
-else
-{
-aFillColor = Color( aColorConfig.GetColorValue(
svtools::DOCCOLOR ).nColor );
-}
+aFillColor = Color( aColorConfig.GetColorValue(
svtools::APPBACKGROUND ).nColor );
mpDrawView->SetApplicationBackgroundColor(aFillColor);
}
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 6ae7a0a..2df7ffc 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -435,14 +435,7 @@ void DrawViewShell::Paint(const Rectangle& rRect,
::sd::Window* pWin)
svtools::ColorConfig aColorConfig;
Color aFillColor;
-if(DOCUMENT_TYPE_IMPRESS == GetDoc()->GetDocumentType())
-{
-aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND
).nColor );
-}
-else
-{
-aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR
).nColor );
-}
+aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND
).nColor );
/* This is done before each text edit, so why not do it before every paint.
The default language is only used if the outliner only
contains one
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Start center background color uses application background co...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1958
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/1958/1
Start center background color uses application background color, fdo51535
Change-Id: I781ea544e052e775f5cc1d709c5c3a319025ab12
---
M framework/source/services/backingwindow.cxx
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/framework/source/services/backingwindow.cxx
b/framework/source/services/backingwindow.cxx
index d633f87..819ec5e 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -40,6 +40,7 @@
#include "svtools/imagemgr.hxx"
#include "svtools/svtools.hrc"
#include "svtools/langhelp.hxx"
+#include "svtools/colorcfg.hxx"
#include "comphelper/processfactory.hxx"
#include "comphelper/sequenceashashmap.hxx"
@@ -660,7 +661,7 @@
void BackingWindow::Paint( const Rectangle& )
{
-Wallpaper aBack( GetSettings().GetStyleSettings().GetWorkspaceColor() );
+Wallpaper aBack(
svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor );
Region aClip( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
Rectangle aBmpRect(maControlRect);
aBmpRect.Left() -= nShadowLeft;
--
To view, visit https://gerrit.libreoffice.org/1958
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I781ea544e052e775f5cc1d709c5c3a319025ab12
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Robert Roth
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Use application background consistently in Draw, fdo#59042
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1957
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/1957/1
Use application background consistently in Draw, fdo#59042
Change-Id: I990a88b2726a7fafe8b15179962f004008090c7a
---
M sd/source/ui/view/drviews4.cxx
M sd/source/ui/view/drviews5.cxx
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index fe92bc0..c3511c9 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -335,14 +335,7 @@
svtools::ColorConfig aColorConfig;
Color aFillColor;
-if(DOCUMENT_TYPE_IMPRESS == GetDoc()->GetDocumentType())
-{
-aFillColor = Color( aColorConfig.GetColorValue(
svtools::APPBACKGROUND ).nColor );
-}
-else
-{
-aFillColor = Color( aColorConfig.GetColorValue(
svtools::DOCCOLOR ).nColor );
-}
+aFillColor = Color( aColorConfig.GetColorValue(
svtools::APPBACKGROUND ).nColor );
mpDrawView->SetApplicationBackgroundColor(aFillColor);
}
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 6ae7a0a..2df7ffc 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -435,14 +435,7 @@
svtools::ColorConfig aColorConfig;
Color aFillColor;
-if(DOCUMENT_TYPE_IMPRESS == GetDoc()->GetDocumentType())
-{
-aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND
).nColor );
-}
-else
-{
-aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR
).nColor );
-}
+aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND
).nColor );
/* This is done before each text edit, so why not do it before every paint.
The default language is only used if the outliner only
contains one
--
To view, visit https://gerrit.libreoffice.org/1957
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I990a88b2726a7fafe8b15179962f004008090c7a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Robert Roth
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Added dialog title, 6 px spacing on Print dialog like in 3.6...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1951 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/1951/1 Added dialog title, 6 px spacing on Print dialog like in 3.6, fdo#59846 Change-Id: Id7c9ff4c7d7da830f9fdfb5046b627b5235c19be --- M vcl/uiconfig/ui/printdialog.ui 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index ae1f41f..4ef0a6b 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -23,6 +23,7 @@ False 5 +Print dialog @@ -207,6 +208,7 @@ False True True +6 True @@ -383,7 +385,8 @@ True False -7 +6 +6 True @@ -402,6 +405,7 @@ True False vertical +6 True @@ -497,12 +501,14 @@ True False vertical +6 True False 6 vertical +6 All sheets @@ -578,6 +584,7 @@ False 6 vertical +6 All pages @@ -773,7 +780,7 @@ True False vertical -3 +6 True @@ -943,6 +950,7 @@ True False +6 7 @@ -1289,6 +1297,8 @@ True False +6 +6 12 @@ -1370,6 +1380,7 @@ True False +6 Print to file -- To view, visit https://gerrit.libreoffice.org/1951 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7c9ff4c7d7da830f9fdfb5046b627b5235c19be Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Added 6 pixel vertical spacing on the Font effects tab, fdo#...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1950 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/1950/1 Added 6 pixel vertical spacing on the Font effects tab, fdo#59846 Change-Id: Id1cd40e3b9e2ae9ba0193708245c62f8ecd9cb96 --- M cui/uiconfig/ui/effectspage.ui 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui index 4fd6862..9ae0686 100644 --- a/cui/uiconfig/ui/effectspage.ui +++ b/cui/uiconfig/ui/effectspage.ui @@ -214,6 +214,7 @@ True False +6 6 @@ -431,11 +432,9 @@ Outline -False True True False -False 0 True True @@ -450,11 +449,9 @@ Shadow -False True True False -False 0 True True @@ -469,11 +466,9 @@ Blinking -False True True False -False 0 True True @@ -488,11 +483,9 @@ Hidden -False True True False -False 0 True True @@ -507,11 +500,9 @@ Individual words -False True True False -False 0 True -- To view, visit https://gerrit.libreoffice.org/1950 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1cd40e3b9e2ae9ba0193708245c62f8ecd9cb96 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Added 6 pixel vertical spacing on the Font tab, fdo#59846
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1949 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/1949/1 Added 6 pixel vertical spacing on the Font tab, fdo#59846 Change-Id: I61c85b75b026e15541101b25cf254aa64c3e1762 --- M cui/uiconfig/ui/charnamepage.ui 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index 2df58c5..87baae1 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -24,6 +24,7 @@ False True True +6 6 @@ -218,6 +219,7 @@ False True True +6 6 @@ -396,6 +398,7 @@ False True True +6 6 @@ -574,6 +577,7 @@ False True True +6 6 -- To view, visit https://gerrit.libreoffice.org/1949 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61c85b75b026e15541101b25cf254aa64c3e1762 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Removed empty app.src from draw
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1910 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/1910/1 Removed empty app.src from draw Change-Id: I4e9bd57db4510b48b84847dda23feed5b8817df3 --- M sd/AllLangResTarget_sd.mk D sd/source/ui/app/app.src 2 files changed, 0 insertions(+), 26 deletions(-) diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 455dbbc..4068afc 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -63,7 +63,6 @@ sd/source/ui/animations/CustomAnimation.src \ sd/source/ui/animations/SlideTransitionPane.src \ sd/source/ui/annotations/annotations.src \ -sd/source/ui/app/app.src \ sd/source/ui/app/popup.src \ sd/source/ui/app/res_bmp.src \ sd/source/ui/app/sdstring.src \ diff --git a/sd/source/ui/app/app.src b/sd/source/ui/app/app.src deleted file mode 100644 index 57ded37..000 --- a/sd/source/ui/app/app.src +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include "app.hrc" -#include "res_bmp.hrc" -#include -#include "cfgids.hxx" -#include - -- To view, visit https://gerrit.libreoffice.org/1910 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e9bd57db4510b48b84847dda23feed5b8817df3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Show meaningful title for search key not found infobox, fdo#...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1888
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/1888/1
Show meaningful title for search key not found infobox, fdo#59865
Change-Id: I5c99fc98552be705ddcb163320521620bdcbf7ef
---
M sw/source/ui/uiview/viewsrch.cxx
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 9cad97b..8e1f9c3 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -37,6 +37,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include "editeng/unolingu.hxx"
@@ -85,6 +87,21 @@
else
pWin = 0;
return pWin;
+}
+
+inline void ShowNotFoundInfoBox( SvxSearchDialog* pSrchDlg )
+{
+Window* pParentWindow = GetParentWindow( pSrchDlg );
+InfoBox aBox( pParentWindow, SW_RES(MSG_NOT_FOUND));
+if (pParentWindow)
+{
+aBox.SetText(pParentWindow->GetText());
+}
+else
+{
+aBox.SetText(SVX_RESSTR(RID_SVXSTR_FINDBAR_FIND));
+}
+aBox.Execute();
}
void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
@@ -211,8 +228,7 @@
{
if( !bApi )
{
-Window* pParentWindow = GetParentWindow( pSrchDlg );
-InfoBox( pParentWindow,
SW_RES(MSG_NOT_FOUND)).Execute();
+ShowNotFoundInfoBox( pSrchDlg );
}
bFound = sal_False;
}
@@ -311,8 +327,7 @@
{
if( !bApi )
{
-Window* pParentWindow = GetParentWindow( pSrchDlg
);
-InfoBox( pParentWindow,
SW_RES(MSG_NOT_FOUND)).Execute();
+ShowNotFoundInfoBox( pSrchDlg );
}
bFound = sal_False;
return;
@@ -483,8 +498,7 @@
pWrtShell->EndAllAction();
if( !bApi )
{
-Window* pParentWindow = GetParentWindow( pSrchDlg );
-InfoBox( pParentWindow, SW_RES(MSG_NOT_FOUND)).Execute();
+ShowNotFoundInfoBox( pSrchDlg );
}
bFound = sal_False;
pWrtShell->Pop();
@@ -528,8 +542,7 @@
return bFound;
if(!bApi)
{
-Window* pParentWindow = GetParentWindow( pSrchDlg );
-InfoBox( pParentWindow, SW_RES(MSG_NOT_FOUND)).Execute();
+ShowNotFoundInfoBox( pSrchDlg );
}
return bFound = sal_False;
}
--
To view, visit https://gerrit.libreoffice.org/1888
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c99fc98552be705ddcb163320521620bdcbf7ef
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Robert Roth
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Removed empty autocorr.src file
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1887 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/1887/1 Removed empty autocorr.src file Change-Id: Ic19ffbe0b629482a3cadaaf15a77ba2443312957 --- M sw/AllLangResTarget_sw.mk D sw/source/ui/misc/autocorr.src 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 9fbfa31..a388fc1 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -136,7 +136,6 @@ sw/source/ui/index/idxmrk.src \ sw/source/ui/index/multmrk.src \ sw/source/ui/lingu/olmenu.src \ -sw/source/ui/misc/autocorr.src \ sw/source/ui/misc/docfnote.src \ sw/source/ui/misc/glossary.src \ sw/source/ui/misc/numberingtypelistbox.src \ diff --git a/sw/source/ui/misc/autocorr.src b/sw/source/ui/misc/autocorr.src deleted file mode 100644 index 14bebe3..000 --- a/sw/source/ui/misc/autocorr.src +++ /dev/null @@ -1,18 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -/* StarView resource file */ -- To view, visit https://gerrit.libreoffice.org/1887 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic19ffbe0b629482a3cadaaf15a77ba2443312957 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] New table dialog from impress and draw converted to Glade UI
+ +False +True +2 + + + + +False +True +end +0 + + + + +True +False +6 +12 +12 + + +True +False +True +0 +_Number of columns: +True +columns + + +0 +0 +1 +1 + + + + +True +False +True +0 +_Number of rows: +True +rows + + +0 +1 +1 +1 + + + + +True +True +True +• +True +columns_value +1 +True +True + + +1 +0 +1 +1 + + + + +True +True +• +rows_value +True +True + + +1 +1 +1 +1 + + + + +True +True +1 + + + + + + button1 + ok + cancel + + + +1 +75 +2 +1 +10 + + +1 +75 +5 +1 +10 + + -- To view, visit https://gerrit.libreoffice.org/1874 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedd44ae171a25d9d6599e4f44698d7458c486be6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
