[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source sd/source sw/source vcl/uiconfig

2020-10-27 Thread Srijan Bhatia (via logerrit) 
 sc/source/ui/unoobj/docuno.cxx |4 ++--
 sd/source/ui/view/DocumentRenderer.cxx |4 ++--
 sw/source/core/view/printdata.cxx  |4 ++--
 vcl/uiconfig/ui/printdialog.ui |4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit cd1c6c06cdba864238e1a590759b053ef12b80cb
Author: Srijan Bhatia 
AuthorDate: Sun Jul 12 21:27:08 2020 +0530
Commit: Xisco Fauli 
CommitDate: Tue Oct 27 18:36:47 2020 +0100

tdf#127680 change even/odd dialog order

Change-Id: I6dea25b3d212072df9a6638dc774f35e203e1f80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98602
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104878

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index dec6a92b3362..4ade34d59481 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1625,8 +1625,8 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount(const 
uno::Any& aSelection,
 return pDocShell->GetDocument().GetTableCount();
 }
 
-bool bIsPrintEvenPages = (nEOContent != 2 && nContent == 0) || nContent != 
0;
-bool bIsPrintOddPages = (nEOContent != 1 && nContent == 0) || nContent != 
0;
+bool bIsPrintEvenPages = (nEOContent != 1 && nContent == 0) || nContent != 
0;
+bool bIsPrintOddPages = (nEOContent != 2 && nContent == 0) || nContent != 
0;
 
 for ( sal_Int32 nPage = 1; nPage <= nPages; nPage++ )
 {
diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index 8a9be771b149..3c3f44de011d 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -187,13 +187,13 @@ namespace {
 bool IsPrintFrontPage() const
 {
 sal_Int32 nInclude = 
static_cast(mrProperties.getIntValue( "EvenOdd", 0 ));
-return nInclude != 1;
+return nInclude != 2;
 }
 
 bool IsPrintBackPage() const
 {
 sal_Int32 nInclude = 
static_cast(mrProperties.getIntValue( "EvenOdd", 0 ));
-return nInclude != 2;
+return nInclude != 1;
 }
 
 bool IsPaperBin() const
diff --git a/sw/source/core/view/printdata.cxx 
b/sw/source/core/view/printdata.cxx
index 5c24e1dd691d..4001314a953f 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -388,7 +388,7 @@ bool SwPrintUIOptions::IsPrintLeftPages() const
 // 1: left pages only
 // 2: right pages only
 sal_Int64 nEOPages = getIntValue( "EvenOdd", 0 /* default: all */ );
-bool bRes = nEOPages != 2;
+bool bRes = nEOPages != 1;
 bRes = getBoolValue( "EvenOdd", bRes /* <- default value if property is 
not found */ );
 return bRes;
 }
@@ -399,7 +399,7 @@ bool SwPrintUIOptions::IsPrintRightPages() const
 // for compatibility the old name should win (may still be used for PDF 
export or via Uno API)
 
 sal_Int64 nEOPages = getIntValue( "EvenOdd", 0 /* default: all */ );
-bool bRes = nEOPages != 1;
+bool bRes = nEOPages != 2;
 bRes = getBoolValue( "EvenOdd", bRes /* <- default value if property is 
not found */ );
 return bRes;
 }
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 5cd2dfd4553b..584454e2ab4f 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -577,9 +577,9 @@
 True
 0
 
-  Even and Odd Pages
-  Even Pages
+  Odd and Even Pages
   Odd Pages
+  Even Pages
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source sw/source

2020-10-27 Thread Srijan Bhatia (via logerrit) 
 sfx2/source/view/viewprn.cxx |   10 +-
 sw/source/core/doc/doc.cxx   |4 +---
 2 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit fdfd3638a3a2ca099cc47f8eb0d449f4c64fd200
Author: Srijan Bhatia 
AuthorDate: Thu Jul 30 16:43:01 2020 +0530
Commit: Xisco Fauli 
CommitDate: Tue Oct 27 18:37:19 2020 +0100

tdf#135082 fix print selection

Change-Id: Id4d48f25161aac20e8594b5e32c5dbe09e78ccc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99790
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104879

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 4db985c961d9..dabb57c27b4f 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -190,20 +190,12 @@ const Any& SfxPrinterController::getSelectionObject() 
const
 return bSel ? maSelection : maCompleteSelection;
 }
 
-bool bIsCalc = false;
-pVal = getValue( OUString( "PrintRange" ) );
-if ( pVal )
-bIsCalc = true;
-
 sal_Int32 nChoice = 0;
 pVal = getValue( OUString( "PrintContent" ) );
 if( pVal )
 pVal->Value >>= nChoice;
 
-if ( bIsCalc )
-return (nChoice > 1) ? maSelection : maCompleteSelection;
-else
-return (nChoice > 3) ? maSelection : maCompleteSelection;
+return (nChoice > 1) ? maSelection : maCompleteSelection;
 }
 
 Sequence< beans::PropertyValue > SfxPrinterController::getMergedOptions() const
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 3609e634e598..b850b2c8ac4e 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -721,9 +721,7 @@ void SwDoc::CalculatePagesForPrinting(
 // PageContent :
 // 0 -> print all pages (default if aPageRange is empty)
 // 1 -> print range according to PageRange
-// 2 -> print even pages
-// 3 -> print odd pages
-// 4 -> print selection
+// 2 -> print selection
 if (1 == nContent)
 aPageRange = rOptions.getStringValue( "PageRange" );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - basctl/source sc/source sd/inc sd/source sw/source vcl/uiconfig

2020-10-27 Thread Srijan Bhatia (via logerrit) 
 basctl/source/basicide/basicrenderable.cxx |   27 -
 sc/source/ui/unoobj/docuno.cxx |   58 -
 sd/inc/DocumentRenderer.hrc|4 --
 sd/source/ui/view/DocumentRenderer.cxx |   26 ++---
 sw/source/core/doc/doc.cxx |   11 ++---
 sw/source/core/view/printdata.cxx  |   50 +
 vcl/uiconfig/ui/printdialog.ui |   43 +
 7 files changed, 118 insertions(+), 101 deletions(-)

New commits:
commit 482507d7bbc915fd5a10c64bfb60695b2a233a12
Author: Srijan Bhatia 
AuthorDate: Thu Jun 18 18:41:14 2020 +0530
Commit: Xisco Fauli 
CommitDate: Tue Oct 27 18:36:27 2020 +0100

tdf#127680 Add the option to print even or odd values from a particular 
range

Added a box besides the pages option that lets the user choose between left 
and right pages/left pages/right pages.

Change-Id: Iee0386f4f3cfd2dac3fcf898a3fefb5434cb27a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96612
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104877
Reviewed-by: Sophie Gautier 

diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index eae8b5c81c93..8e4bab711ce8 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -37,7 +37,7 @@ Renderable::Renderable (BaseWindow* pWin)
 : cppu::WeakComponentImplHelper< css::view::XRenderable >( maMutex )
 , mpWindow( pWin )
 {
-m_aUIProperties.resize( 3 );
+m_aUIProperties.resize( 4 );
 
 // show Subgroup for print range
 vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
@@ -50,17 +50,11 @@ Renderable::Renderable (BaseWindow* pWin)
 // create a choice for the range to print
 OUString aPrintContentName( "PrintContent" );
 const Sequence aChoices{IDEResId(RID_STR_PRINTDLG_PRINTALLPAGES),
-  IDEResId(RID_STR_PRINTDLG_PRINTPAGES),
-  
IDEResId(RID_STR_PRINTDLG_PRINTEVENPAGES),
-  
IDEResId(RID_STR_PRINTDLG_PRINTODDPAGES)};
+  IDEResId(RID_STR_PRINTDLG_PRINTPAGES)};
 const Sequence 
aHelpIds{".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0",
-  
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1",
-  
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2",
-  
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:3"};
+  
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1"};
 const Sequence aWidgetIds{"rbAllPages",
-"rbRangePages",
-"rbEvenPages",
-"rbOddPages"};
+"rbRangePages"};
 m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, 
OUString(),
aHelpIds, aPrintContentName,
aChoices, 0);
@@ -70,6 +64,16 @@ Renderable::Renderable (BaseWindow* pWin)
 m_aUIProperties[2].Value = setEditControlOpt("pagerange", OUString(),
  OUString(), "PageRange",
  OUString(), aPageRangeOpt);
+
+vcl::PrinterOptionsHelper::UIControlOptions aEvenOddOpt(aPrintContentName, 
0, true);
+m_aUIProperties[3].Value = setChoiceListControlOpt("evenoddbox",
+OUString(),
+
uno::Sequence(),
+"EvenOdd",
+
uno::Sequence(),
+0,
+uno::Sequence< 
sal_Bool >(),
+aEvenOddOpt);
 }
 
 Renderable::~Renderable()
@@ -130,6 +134,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount (
 }
 
 sal_Int64 nContent = getIntValue( "PrintContent", -1 );
+sal_Int64 nEOContent = getIntValue ("EvenOdd", -1);
 if( nContent == 1 )
 {
 OUString aPageRange( getStringValue( "PageRange" ) );
@@ -141,7 +146,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount (
 nCount = nSelCount;
 }
 }
-else if ( nContent == 2 || nContent == 3 ) // even/odd pages
+else if ( nEOContent == 1 || nEOContent == 2 ) // even/odd pages
 return static_cast(

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg sdext/source sd/inc sd/source

2020-08-07 Thread Srijan Bhatia (via logerrit) 
 icon-themes/colibre/sd/res/presenterscreen-Separator.png |binary
 icon-themes/colibre_svg/sd/res/presenterscreen-Separator.svg |1 +
 sd/inc/bitmaps.hlst  |1 +
 sd/source/ui/presenter/PresenterHelper.cxx   |4 +++-
 sdext/source/presenter/PresenterToolBar.cxx  |   10 +++---
 5 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit d04260e5318fad36b3a29deaf9a823052bc6bea9
Author: Srijan Bhatia 
AuthorDate: Tue Aug 4 13:43:21 2020 +0530
Commit: Heiko Tietze 
CommitDate: Sat Aug 8 07:55:34 2020 +0200

Presenter console new vertical separator

Change-Id: I82e30a8dd73ba91605ae839847fb6378b1d54b3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100044
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/colibre/sd/res/presenterscreen-Separator.png 
b/icon-themes/colibre/sd/res/presenterscreen-Separator.png
new file mode 100644
index ..a7a35fa7e632
Binary files /dev/null and 
b/icon-themes/colibre/sd/res/presenterscreen-Separator.png differ
diff --git a/icon-themes/colibre_svg/sd/res/presenterscreen-Separator.svg 
b/icon-themes/colibre_svg/sd/res/presenterscreen-Separator.svg
new file mode 100644
index ..aa8a387ad5d3
--- /dev/null
+++ b/icon-themes/colibre_svg/sd/res/presenterscreen-Separator.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst
index 748ea562efa1..6186abcab3c1 100644
--- a/sd/inc/bitmaps.hlst
+++ b/sd/inc/bitmaps.hlst
@@ -104,6 +104,7 @@
 #define BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT  
"sd/res/presenterscreen-BorderActiveLeft.png"
 #define BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL  
"sd/res/presenterscreen-ButtonHelpNormal.png"
 #define BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_NORMAL
"sd/res/presenterscreen-ButtonExitPresenterNormal.png"
+#define BMP_PRESENTERSCREEN_SEPARATOR   
"sd/res/presenterscreen-Separator.png"
 #define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT
"sd/res/presenterscreen-BorderActiveBottomCallout.png"
 #define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT 
"sd/res/presenterscreen-BorderToolbarLeft.png"
 #define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL  
"sd/res/presenterscreen-ButtonSlideSorterNormal.png"
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx 
b/sd/source/ui/presenter/PresenterHelper.cxx
index ec1d63e7029c..7504e914e475 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -380,7 +380,9 @@ Reference SAL_CALL 
PresenterHelper::loadBitmap (
   BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER },
 { "bitmaps/ScrollbarThumbTopNormal.png",
   BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL },
-{ "bitmaps/ViewBackground.png", BMP_PRESENTERSCREEN_VIEW_BACKGROUND }
+{ "bitmaps/ViewBackground.png", BMP_PRESENTERSCREEN_VIEW_BACKGROUND },
+{ "bitmaps/Separator.png",
+  BMP_PRESENTERSCREEN_SEPARATOR }
 };
 OUString bmpid;
 for (std::size_t i = 0; i != SAL_N_ELEMENTS(map); ++i) {
diff --git a/sdext/source/presenter/PresenterToolBar.cxx 
b/sdext/source/presenter/PresenterToolBar.cxx
index ad0f36707c11..d36f42277da4 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1953,7 +1953,7 @@ void VerticalSeparator::Paint (
 awt::Rectangle aBBox (GetBoundingBox());
 
 rendering::RenderState aRenderState(
-geometry::AffineMatrix2D(1,0,0, 0,1,0),
+geometry::AffineMatrix2D(1,0,aBBox.X, 0,1,aBBox.Y),
 nullptr,
 Sequence(4),
 rendering::CompositeOperation::OVER);
@@ -1964,8 +1964,12 @@ void VerticalSeparator::Paint (
 PresenterCanvasHelper::SetDeviceColor(aRenderState, 
pFont->mnColor);
 }
 
-rxCanvas->fillPolyPolygon(
-PresenterGeometryHelper::CreatePolygon(aBBox, rxCanvas->getDevice()),
+Reference 
xBitmap(mpToolBar->GetPresenterController()->GetPresenterHelper()->loadBitmap("bitmaps/Separator.png",
 rxCanvas));
+if (!xBitmap.is())
+return;
+
+rxCanvas->drawBitmap(
+xBitmap,
 rViewState,
 aRenderState);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source sw/source

2020-08-07 Thread Srijan Bhatia (via logerrit) 
 sfx2/source/view/viewprn.cxx |   10 +-
 sw/source/core/doc/doc.cxx   |4 +---
 2 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit aedbbfd934c65b4d73afd13020116fb65567f0d1
Author: Srijan Bhatia 
AuthorDate: Thu Jul 30 16:43:01 2020 +0530
Commit: Mike Kaganski 
CommitDate: Fri Aug 7 15:57:36 2020 +0200

tdf#135082 fix print selection

Change-Id: Id4d48f25161aac20e8594b5e32c5dbe09e78ccc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99790
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 19b954d26fe6..45341cd1892a 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -189,20 +189,12 @@ const Any& SfxPrinterController::getSelectionObject() 
const
 return bSel ? maSelection : maCompleteSelection;
 }
 
-bool bIsCalc = false;
-pVal = getValue( OUString( "PrintRange" ) );
-if ( pVal )
-bIsCalc = true;
-
 sal_Int32 nChoice = 0;
 pVal = getValue( OUString( "PrintContent" ) );
 if( pVal )
 pVal->Value >>= nChoice;
 
-if ( bIsCalc )
-return (nChoice > 1) ? maSelection : maCompleteSelection;
-else
-return (nChoice > 3) ? maSelection : maCompleteSelection;
+return (nChoice > 1) ? maSelection : maCompleteSelection;
 }
 
 Sequence< beans::PropertyValue > SfxPrinterController::getMergedOptions() const
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index f560de2e7238..69dcd0f98039 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -721,9 +721,7 @@ void SwDoc::CalculatePagesForPrinting(
 // PageContent :
 // 0 -> print all pages (default if aPageRange is empty)
 // 1 -> print range according to PageRange
-// 2 -> print even pages
-// 3 -> print odd pages
-// 4 -> print selection
+// 2 -> print selection
 if (1 == nContent)
 aPageRange = rOptions.getStringValue( "PageRange" );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source sd/source sw/source vcl/uiconfig

2020-07-24 Thread Srijan Bhatia (via logerrit) 
 sc/source/ui/unoobj/docuno.cxx |4 ++--
 sd/source/ui/view/DocumentRenderer.cxx |4 ++--
 sw/source/core/view/printdata.cxx  |4 ++--
 vcl/uiconfig/ui/printdialog.ui |4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 28df1d9a8d51ce8b682a9723fcc2810127c3d7a2
Author: Srijan Bhatia 
AuthorDate: Sun Jul 12 21:27:08 2020 +0530
Commit: Mike Kaganski 
CommitDate: Fri Jul 24 11:40:52 2020 +0200

tdf#127680 change even/odd dialog order

Change-Id: I6dea25b3d212072df9a6638dc774f35e203e1f80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98602
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 9c2294e09849..952912808024 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1695,8 +1695,8 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount(const 
uno::Any& aSelection,
 return pDocShell->GetDocument().GetTableCount();
 }
 
-bool bIsPrintEvenPages = (nEOContent != 2 && nContent == 0) || nContent != 
0;
-bool bIsPrintOddPages = (nEOContent != 1 && nContent == 0) || nContent != 
0;
+bool bIsPrintEvenPages = (nEOContent != 1 && nContent == 0) || nContent != 
0;
+bool bIsPrintOddPages = (nEOContent != 2 && nContent == 0) || nContent != 
0;
 
 for ( sal_Int32 nPage = 1; nPage <= nPages; nPage++ )
 {
diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index 8a9be771b149..3c3f44de011d 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -187,13 +187,13 @@ namespace {
 bool IsPrintFrontPage() const
 {
 sal_Int32 nInclude = 
static_cast(mrProperties.getIntValue( "EvenOdd", 0 ));
-return nInclude != 1;
+return nInclude != 2;
 }
 
 bool IsPrintBackPage() const
 {
 sal_Int32 nInclude = 
static_cast(mrProperties.getIntValue( "EvenOdd", 0 ));
-return nInclude != 2;
+return nInclude != 1;
 }
 
 bool IsPaperBin() const
diff --git a/sw/source/core/view/printdata.cxx 
b/sw/source/core/view/printdata.cxx
index 5c24e1dd691d..4001314a953f 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -388,7 +388,7 @@ bool SwPrintUIOptions::IsPrintLeftPages() const
 // 1: left pages only
 // 2: right pages only
 sal_Int64 nEOPages = getIntValue( "EvenOdd", 0 /* default: all */ );
-bool bRes = nEOPages != 2;
+bool bRes = nEOPages != 1;
 bRes = getBoolValue( "EvenOdd", bRes /* <- default value if property is 
not found */ );
 return bRes;
 }
@@ -399,7 +399,7 @@ bool SwPrintUIOptions::IsPrintRightPages() const
 // for compatibility the old name should win (may still be used for PDF 
export or via Uno API)
 
 sal_Int64 nEOPages = getIntValue( "EvenOdd", 0 /* default: all */ );
-bool bRes = nEOPages != 1;
+bool bRes = nEOPages != 2;
 bRes = getBoolValue( "EvenOdd", bRes /* <- default value if property is 
not found */ );
 return bRes;
 }
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 5cd2dfd4553b..584454e2ab4f 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -577,9 +577,9 @@
 True
 0
 
-  Even and Odd Pages
-  Even Pages
+  Odd and Even Pages
   Odd Pages
+  Even Pages
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

2020-07-17 Thread Srijan Bhatia (via logerrit) 
 sd/source/ui/animations/CustomAnimationPane.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 4d78d8a0648acabb0a3e809f8788b37b1396
Author: Srijan Bhatia 
AuthorDate: Wed Jul 1 17:24:03 2020 +0530
Commit: Noel Grandin 
CommitDate: Fri Jul 17 08:55:39 2020 +0200

tdf#126394 Allow changing animations for several objects at once

Change-Id: Ia1adea3492f5b7b4e4d217a5fd338c69759259d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97619
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 0b81244ff811..5e80435051bd 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -493,7 +493,7 @@ void CustomAnimationPane::updateControls()
 
 mxPBAddEffect->set_sensitive( maViewSelection.hasValue() );
 mxPBRemoveEffect->set_sensitive(nSelectionCount != 0);
-bool bIsSelected = (nSelectionCount == 1);
+bool bIsSelected = (nSelectionCount > 0);
 
 if(bIsSelected)
 {
@@ -2087,9 +2087,6 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, 
weld::TreeView&, void)
 
 mnLastSelectedAnimation = nSelected;
 
-if( maListSelection.size() != 1 )
-return;
-
 CustomAnimationPresetPtr* pPreset = 
reinterpret_cast(mxLBAnimation->get_id(nSelected).toInt64());
 PathKind ePathKind = getCreatePathKind();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sdext/source

2020-07-12 Thread Srijan Bhatia (via logerrit) 
 sdext/source/presenter/PresenterToolBar.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ffe503b62f9a508285ed06ef977f91604130579a
Author: Srijan Bhatia 
AuthorDate: Sun Jul 12 20:29:28 2020 +0530
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jul 13 00:35:02 2020 +0200

tdf#90978 add gap between the exit button and the right edge of the toolbar

Change-Id: I703f3bd21101daeaa58ce1c0659e275335f26727
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98601
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sdext/source/presenter/PresenterToolBar.cxx 
b/sdext/source/presenter/PresenterToolBar.cxx
index e3f2d6da7cba..4f700339dc5a 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -718,6 +718,9 @@ void PresenterToolBar::Layout (
 nGapCount += maElementContainer.size()-1;
 }
 
+// Done to introduce gap between the end of the toolbar and the last button
+aTotalSize.Width += gnGapSize/2;
+
 // Calculate the minimal size so that the window size of the tool bar
 // can be adapted accordingly.
 maMinimalSize = aTotalSize;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source sc/source sd/inc sd/source sw/source vcl/uiconfig

2020-07-02 Thread Srijan Bhatia (via logerrit) 
 basctl/source/basicide/basicrenderable.cxx |   27 -
 sc/source/ui/unoobj/docuno.cxx |   58 -
 sd/inc/DocumentRenderer.hrc|4 --
 sd/source/ui/view/DocumentRenderer.cxx |   26 ++---
 sw/source/core/doc/doc.cxx |   11 ++---
 sw/source/core/view/printdata.cxx  |   50 +
 vcl/uiconfig/ui/printdialog.ui |   43 +
 7 files changed, 118 insertions(+), 101 deletions(-)

New commits:
commit 14b8c176133979cd1c3163ef5fe3eed0e6479fea
Author: Srijan Bhatia 
AuthorDate: Thu Jun 18 18:41:14 2020 +0530
Commit: Mike Kaganski 
CommitDate: Thu Jul 2 12:12:02 2020 +0200

tdf#127680 Add the option to print even or odd values from a particular 
range

Added a box besides the pages option that lets the user choose between left 
and right pages/left pages/right pages.

Change-Id: Iee0386f4f3cfd2dac3fcf898a3fefb5434cb27a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96612
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Mike Kaganski 

diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index eae8b5c81c93..8e4bab711ce8 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -37,7 +37,7 @@ Renderable::Renderable (BaseWindow* pWin)
 : cppu::WeakComponentImplHelper< css::view::XRenderable >( maMutex )
 , mpWindow( pWin )
 {
-m_aUIProperties.resize( 3 );
+m_aUIProperties.resize( 4 );
 
 // show Subgroup for print range
 vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
@@ -50,17 +50,11 @@ Renderable::Renderable (BaseWindow* pWin)
 // create a choice for the range to print
 OUString aPrintContentName( "PrintContent" );
 const Sequence aChoices{IDEResId(RID_STR_PRINTDLG_PRINTALLPAGES),
-  IDEResId(RID_STR_PRINTDLG_PRINTPAGES),
-  
IDEResId(RID_STR_PRINTDLG_PRINTEVENPAGES),
-  
IDEResId(RID_STR_PRINTDLG_PRINTODDPAGES)};
+  IDEResId(RID_STR_PRINTDLG_PRINTPAGES)};
 const Sequence 
aHelpIds{".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0",
-  
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1",
-  
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2",
-  
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:3"};
+  
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1"};
 const Sequence aWidgetIds{"rbAllPages",
-"rbRangePages",
-"rbEvenPages",
-"rbOddPages"};
+"rbRangePages"};
 m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, 
OUString(),
aHelpIds, aPrintContentName,
aChoices, 0);
@@ -70,6 +64,16 @@ Renderable::Renderable (BaseWindow* pWin)
 m_aUIProperties[2].Value = setEditControlOpt("pagerange", OUString(),
  OUString(), "PageRange",
  OUString(), aPageRangeOpt);
+
+vcl::PrinterOptionsHelper::UIControlOptions aEvenOddOpt(aPrintContentName, 
0, true);
+m_aUIProperties[3].Value = setChoiceListControlOpt("evenoddbox",
+OUString(),
+
uno::Sequence(),
+"EvenOdd",
+
uno::Sequence(),
+0,
+uno::Sequence< 
sal_Bool >(),
+aEvenOddOpt);
 }
 
 Renderable::~Renderable()
@@ -130,6 +134,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount (
 }
 
 sal_Int64 nContent = getIntValue( "PrintContent", -1 );
+sal_Int64 nEOContent = getIntValue ("EvenOdd", -1);
 if( nContent == 1 )
 {
 OUString aPageRange( getStringValue( "PageRange" ) );
@@ -141,7 +146,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount (
 nCount = nSelCount;
 }
 }
-else if ( nContent == 2 || nContent == 3 ) // even/odd pages
+else if ( nEOContent == 1 || nEOContent == 2 ) // even/odd pages
 return static_cast( maValidPages.size() );
 }
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index cce2b7816d94..68c48ac8e9de

[Libreoffice-commits] core.git: sdext/source

2020-06-28 Thread Srijan Bhatia (via logerrit) 
 sdext/source/presenter/PresenterToolBar.cxx |   25 +
 1 file changed, 21 insertions(+), 4 deletions(-)

New commits:
commit d53a4f126e9d3ec0a63684d4c7af3108f352791c
Author: Srijan Bhatia 
AuthorDate: Thu Jun 25 20:21:48 2020 +0530
Commit: Heiko Tietze 
CommitDate: Sun Jun 28 08:20:48 2020 +0200

tdf#128964 fix shifting of icons when the pause/resume button changes

Added a property that specifies width of the button in the presenter 
toolbar.

Change-Id: I556ec0363064b36ef9fe80f2d947849cee356a1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97151
Tested-by: Jenkins
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git a/sdext/source/presenter/PresenterToolBar.cxx 
b/sdext/source/presenter/PresenterToolBar.cxx
index a0a57c6d8b44..bd69a262ee59 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1459,9 +1459,24 @@ awt::Size Button::CreateBoundingSize (
 return awt::Size();
 
 geometry::RealRectangle2D aTextBBox 
(mpMode->maText.GetBoundingBox(rxCanvas));
+
+// tdf#128964 This ensures that if the text of a button changes due to a 
change in
+// the state of the button the other buttons of the toolbar do not move. 
The button is
+// allotted the maximum size so that it doesn't resize during a change of 
state.
+geometry::RealRectangle2D aTextBBoxNormal 
(mpNormal->maText.GetBoundingBox(rxCanvas));
+geometry::RealRectangle2D aTextBBoxMouseOver 
(mpMouseOver->maText.GetBoundingBox(rxCanvas));
+geometry::RealRectangle2D aTextBBoxSelected 
(mpSelected->maText.GetBoundingBox(rxCanvas));
+geometry::RealRectangle2D aTextBBoxDisabled 
(mpDisabled->maText.GetBoundingBox(rxCanvas));
+geometry::RealRectangle2D aTextBBoxMouseOverSelected 
(mpMouseOverSelected->maText.GetBoundingBox(rxCanvas));
+std::vector widths;
+widths.push_back(sal::static_int_cast(0.5 + aTextBBoxNormal.X2 
- aTextBBoxNormal.X1));
+widths.push_back(sal::static_int_cast(0.5 + 
aTextBBoxMouseOver.X2 - aTextBBoxMouseOver.X1));
+widths.push_back(sal::static_int_cast(0.5 + 
aTextBBoxSelected.X2 - aTextBBoxSelected.X1));
+widths.push_back(sal::static_int_cast(0.5 + 
aTextBBoxDisabled.X2 - aTextBBoxDisabled.X1));
+widths.push_back(sal::static_int_cast(0.5 + 
aTextBBoxMouseOverSelected.X2 - aTextBBoxMouseOverSelected.X1));
+
 const sal_Int32 nGap (5);
 sal_Int32 nTextHeight (sal::static_int_cast(0.5 + aTextBBox.Y2 
- aTextBBox.Y1));
-sal_Int32 nTextWidth (sal::static_int_cast(0.5 + aTextBBox.X2 - 
aTextBBox.X1));
 Reference xBitmap;
 if (mpMode->mpIcon)
 xBitmap = mpMode->mpIcon->GetNormalBitmap();
@@ -1469,11 +1484,13 @@ awt::Size Button::CreateBoundingSize (
 {
 geometry::IntegerSize2D aSize (xBitmap->getSize());
 return awt::Size(
-::std::max(aSize.Width, sal_Int32(0.5 + aTextBBox.X2 - 
aTextBBox.X1)),
-aSize.Height+ nGap + nTextHeight);
+::std::max(aSize.Width, *std::max_element(widths.begin(), 
widths.end())),
+aSize.Height + nGap + nTextHeight);
 }
 else
-return awt::Size(nTextWidth,nTextHeight);
+{
+return awt::Size(*std::max_element(widths.begin(), widths.end()), 
nTextHeight);
+}
 }
 
 void Button::PaintIcon (
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg officecfg/registry sdext/source sd/inc sd/source

2020-06-27 Thread Srijan Bhatia (via logerrit) 
 icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterMouseOver.png
 |binary
 icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterNormal.png   
 |binary
 
icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterMouseOver.svg 
|1 
 icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterNormal.svg   
 |1 
 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu  
 |   59 ++
 sd/inc/bitmaps.hlst
 |2 
 sd/source/ui/presenter/PresenterHelper.cxx 
 |4 
 sdext/source/presenter/PresenterController.cxx 
 |   14 ++
 sdext/source/presenter/PresenterController.hxx 
 |1 
 sdext/source/presenter/PresenterProtocolHandler.cxx
 |   26 
 10 files changed, 108 insertions(+)

New commits:
commit e13ba48c7ff428ee0da29ee3bbb29ee3a1063540
Author: Srijan Bhatia 
AuthorDate: Wed Jun 24 20:35:00 2020 +0530
Commit: Heiko Tietze 
CommitDate: Sat Jun 27 12:01:23 2020 +0200

tdf#90978 add exit button to impress presenter console

Change-Id: If8a5226d700eb7a4137218191b5abc85bbb36b4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97041
Tested-by: Jenkins
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git 
a/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterMouseOver.png 
b/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterMouseOver.png
new file mode 100644
index ..8abf67288d8a
Binary files /dev/null and 
b/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterMouseOver.png 
differ
diff --git 
a/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterNormal.png 
b/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterNormal.png
new file mode 100644
index ..bccf5e20b4ea
Binary files /dev/null and 
b/icon-themes/colibre/sd/res/presenterscreen-ButtonExitPresenterNormal.png 
differ
diff --git 
a/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterMouseOver.svg
 
b/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterMouseOver.svg
new file mode 100644
index ..97f1804fc32f
--- /dev/null
+++ 
b/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterMouseOver.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git 
a/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterNormal.svg 
b/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterNormal.svg
new file mode 100644
index ..33321a959164
--- /dev/null
+++ 
b/icon-themes/colibre_svg/sd/res/presenterscreen-ButtonExitPresenterNormal.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index d5d3bc2e10eb..c60645af20d3 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -618,6 +618,65 @@
   
 
   
+  
+
+  VerticalSeparator
+
+
+  
+
+  76797C
+
+  
+
+  
+  
+
+  ExitPresenter
+
+
+  Button
+
+
+  
+Exit
+  
+  
+
+  bitmaps/ButtonExitPresenterNormal.png
+
+  
+  
+
vnd.org.libreoffice.presenterscreen:ExitPresenter
+  
+  
+
+  12
+
+
+  Bold
+
+
+  B3B7BC
+
+
+  Center
+
+  
+
+
+  
+
+  bitmaps/ButtonExitPresenterMouseOver.png
+
+  
+  
+
+  FF
+
+  
+
+  
 
   
   
diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst
index 69248b4759ba..748ea562efa1 100644
--- a/sd/inc/bitmaps.hlst
+++ b/sd/inc/bitmaps.hlst
@@ -103,6 +103,7 @@
 #define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP  
"sd/res/presenterscreen-BorderToolbarTop.png"
 #define BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT  
"sd/res/presenterscreen-BorderActiveLeft.png"
 #define BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL  
"sd/res/presenterscreen-ButtonHelpNormal.png"
+#define

[Libreoffice-commits] core.git: officecfg/registry sdext/source sd/inc sd/source

2020-06-18 Thread Srijan Bhatia (via logerrit) 
 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu   |   88 

 officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs |5 
 sd/inc/bitmaps.hlst |4 
 sd/source/ui/presenter/PresenterHelper.cxx  |8 
 sdext/source/presenter/PresenterController.hxx  |2 
 sdext/source/presenter/PresenterProtocolHandler.cxx |   75 
+++
 sdext/source/presenter/PresenterToolBar.cxx |  105 
+-
 sdext/source/presenter/PresenterWindowManager.cxx   |   11 +
 sdext/source/presenter/PresenterWindowManager.hxx   |2 
 9 files changed, 286 insertions(+), 14 deletions(-)

New commits:
commit 41d75ee814d71513922a12fae82f2e7eecbcd5f5
Author: Srijan Bhatia 
AuthorDate: Tue Jun 9 20:42:05 2020 +0530
Commit: Heiko Tietze 
CommitDate: Thu Jun 18 10:17:13 2020 +0200

tdf#128964 Add time pause/resume button to Impress Presenter console

Change-Id: I7263c3a8000b4d5930692cd2e32e84a22893dd66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95955
Tested-by: Jenkins
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index 513da5440bb0..d5d3bc2e10eb 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -345,6 +345,86 @@
 
   
   
+
+  PauseResumeTimer
+
+
+  Button
+
+
+  
+Pause
+  
+  
+
+  bitmaps/ButtonPauseTimerNormal.png
+
+  
+  
+
vnd.org.libreoffice.presenterscreen:PauseResumeTimer
+  
+  
+
+  12
+
+
+  Bold
+
+
+  B3B7BC
+
+
+  Center
+
+  
+
+
+  
+
+  bitmaps/ButtonPauseTimerMouseOver.png
+
+  
+  
+
+  FF
+
+  
+
+
+  
+Resume
+  
+  
+
+  bitmaps/ButtonResumeTimerNormal.png
+
+  
+  
+
+  B3B7BC
+
+  
+  
+
vnd.org.libreoffice.presenterscreen:PauseResumeTimer
+  
+
+
+  
+Resume
+  
+  
+
+  bitmaps/ButtonResumeTimerMouseOver.png
+
+  
+  
+
+  FF
+
+  
+
+  
+  
 
   RestartTimer
 
@@ -391,7 +471,7 @@
   
 
   
-  
+  
 
   VerticalSeparator
 
@@ -403,7 +483,7 @@
   
 
   
-  
+  
 
   SwitchMonitor
 
@@ -457,7 +537,7 @@
   
 
   
-  
+  
 
   VerticalSeparator
 
@@ -469,7 +549,7 @@
   
 
   
-  
+  
 
   Help
 
diff --git 
a/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs 
b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
index 01bb5a68b103..1dde3f5f35e1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
@@ -282,6 +282,11 @@
   Description of a tool bar entry when it is selected.
 
   
+  
+
+  Description of a tool bar entry when it is selected and the 
mouse is over it.
+
+  
   
 
   Description of a tool bar entry when it is disabled.
diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst
index 36a8b67720b2..69248b4759ba 100644
--- a/sd/inc/bitmaps.hlst
+++ b/sd/inc/bitmaps.hlst
@@ -122,6 +122,8 @@
 #define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT  
"sd/res/presenterscreen-LabelMouseOverRight.png"
 #define BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/inc sc/qa sc/source

2020-06-15 Thread Srijan Bhatia (via logerrit) 
 sc/inc/globstr.hrc |3 ++-
 sc/qa/extras/scautoformatobj.cxx   |2 +-
 sc/qa/extras/scautoformatsobj.cxx  |2 +-
 sc/qa/uitest/calc_tests6/tdf91726.py   |4 ++--
 sc/source/core/data/attarray.cxx   |2 +-
 sc/source/core/data/docpool.cxx|2 +-
 sc/source/core/data/documen8.cxx   |2 +-
 sc/source/core/data/document.cxx   |7 ++-
 sc/source/core/data/dpoutput.cxx   |2 +-
 sc/source/core/data/patattr.cxx|2 +-
 sc/source/core/data/stlpool.cxx|   16 ++--
 sc/source/core/data/stlsheet.cxx   |4 +++-
 sc/source/core/data/table1.cxx |2 +-
 sc/source/core/data/table5.cxx |2 +-
 sc/source/core/tool/autoform.cxx   |4 ++--
 sc/source/core/tool/stylehelper.cxx|4 ++--
 sc/source/filter/excel/impop.cxx   |2 +-
 sc/source/filter/excel/xestyle.cxx |4 ++--
 sc/source/filter/excel/xistyle.cxx |6 +++---
 sc/source/filter/excel/xltools.cxx |4 ++--
 sc/source/filter/html/htmlexp.cxx  |2 +-
 sc/source/filter/oox/stylesbuffer.cxx  |6 +++---
 sc/source/ui/condformat/condformatdlgentry.cxx |2 +-
 sc/source/ui/docshell/docsh4.cxx   |2 +-
 sc/source/ui/unoobj/cellsuno.cxx   |4 ++--
 sc/source/ui/unoobj/styleuno.cxx   |2 +-
 26 files changed, 53 insertions(+), 41 deletions(-)

New commits:
commit 95f0a01a943961db415b6d036b6b4e1e54292716
Author: Srijan Bhatia 
AuthorDate: Tue Jun 2 18:09:20 2020 +0530
Commit: Heiko Tietze 
CommitDate: Mon Jun 15 11:21:40 2020 +0200

tdf#132137 Rename Default Style in Calc.

Change-Id: I0f7c5ffc64b2387fbb63bb5724594480d3135f58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96215
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index d393739292e5..063d51a3d2ec 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -269,7 +269,8 @@
 #define STR_EXPORT_DBF  NC_("STR_EXPORT_DBF", "DBase 
export")
 #define STR_EXPORT_DIF  NC_("STR_EXPORT_DIF", "Dif 
Export")
 #define STR_IMPORT_DIF  NC_("STR_IMPORT_DIF", "Dif 
Import")
-#define STR_STYLENAME_STANDARD  NC_("STR_STYLENAME_STANDARD", 
"Default")
+#define STR_STYLENAME_STANDARD_CELL NC_("STR_STYLENAME_STANDARD", 
"Default Cell Style")
+#define STR_STYLENAME_STANDARD_PAGE NC_("STR_STYLENAME_STANDARD", 
"Default Page Style")
 #define STR_STYLENAME_RESULTNC_("STR_STYLENAME_RESULT", 
"Result")
 #define STR_STYLENAME_RESULT1   NC_("STR_STYLENAME_RESULT1", 
"Result2")
 #define STR_STYLENAME_HEADLINE  NC_("STR_STYLENAME_HEADLINE", 
"Heading")
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index 76db8c6a3592..23abaa956f1c 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -88,7 +88,7 @@ ScAutoFormatObj::ScAutoFormatObj()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 , XElementAccess(cppu::UnoType::get())
 , XIndexAccess(16)
-, XNamed("Default")
+, XNamed("Default Cell Style")
 , XServiceInfo("ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat")
 {
 }
diff --git a/sc/qa/extras/scautoformatsobj.cxx 
b/sc/qa/extras/scautoformatsobj.cxx
index ed799c018ef4..769478608506 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -89,7 +89,7 @@ ScAutoFormatsObj::ScAutoFormatsObj()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 , XElementAccess(cppu::UnoType::get())
 , XIndexAccess(2)
-, XNameAccess("Default")
+, XNameAccess("Default Cell Style")
 , XNameContainer("ScAutoFormatsObj")
 , XNameReplace("ScAutoFormatsObj")
 , XServiceInfo("stardiv.StarCalc.ScAutoFormatsObj", 
"com.sun.star.sheet.TableAutoFormats")
diff --git a/sc/qa/uitest/calc_tests6/tdf91726.py 
b/sc/qa/uitest/calc_tests6/tdf91726.py
index 38703cb7e34a..4dccc7c697ec 100644
--- a/sc/qa/uitest/calc_tests6/tdf91726.py
+++ b/sc/qa/uitest/calc_tests6/tdf91726.py
@@ -28,7 +28,7 @@ class tdf91726(UITestCase):
 xadd = xDialog.getChild("add")
 def handle_name_dlg(dialog):
 nameEntry = dialog.getChild("name_entry")
-nameEntry.executeAction("TYPE", 
mkPropertyValues({"TEXT":"Default"}))
+nameEntry.executeAction("TYPE", mkPropertyValues({"TEXT":"Default 
Cell Style"}))
 xOKBtn = dialog.getChild("ok")
 def handle_error_dlg(dialog2):
 #Error message: You have entered an invalid name.
@@ -43,7 +43,7 @@ class tdf91726(UITestCase):
 xDialog = self.xUITest.getTopFocusWindow()

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/inc

2020-06-13 Thread Srijan Bhatia (via logerrit) 
 sd/inc/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5efdd8cb7cc9253931557713a09733713c9047bf
Author: Srijan Bhatia 
AuthorDate: Sat May 30 21:17:14 2020 +0530
Commit: Heiko Tietze 
CommitDate: Sat Jun 13 10:25:49 2020 +0200

tdf#132137 Rename Default Style to Default Drawing Style in Draw and 
Impress.

Change-Id: I130bd0e070a3449753cc76a8f7e6352c8b7a1bba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95403
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 
(cherry picked from commit 4949050c43300eee047531d856bd4a25e60980c3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96217
Tested-by: Jenkins

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 54c6d81362a6..0e093d1da84b 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -318,7 +318,7 @@
 #define STR_PRESOBJ_TABLE   
NC_("STR_PRESOBJ_TABLE", "Double-click to add a Spreadsheet" )
 #define STR_LAYOUT_DEFAULT_NAME 
NC_("STR_LAYOUT_DEFAULT_NAME", "Default" )
 #define STR_LAYOUT_DEFAULT_TITLE_NAME   
NC_("STR_LAYOUT_DEFAULT_TITLE_NAME", "Title" )
-#define STR_STANDARD_STYLESHEET_NAME
NC_("STR_STANDARD_STYLESHEET_NAME", "Default" )
+#define STR_STANDARD_STYLESHEET_NAME
NC_("STR_STANDARD_STYLESHEET_NAME", "Default Drawing Style" )
 #define STR_UNDO_MOVEPAGES  
NC_("STR_UNDO_MOVEPAGES", "Move slides" )
 #define STR_INSERT_PAGES
NC_("STR_INSERT_PAGES", "Insert Pages" )
 #define STR_INSERT_PAGE_DRAW
NC_("STR_INSERT_PAGE_DRAW", "Insert Page" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/qa sc/source

2020-06-10 Thread Srijan Bhatia (via logerrit) 
 sc/inc/globstr.hrc |3 ++-
 sc/qa/extras/scautoformatobj.cxx   |2 +-
 sc/qa/extras/scautoformatsobj.cxx  |2 +-
 sc/qa/uitest/calc_tests6/tdf91726.py   |4 ++--
 sc/source/core/data/attarray.cxx   |2 +-
 sc/source/core/data/docpool.cxx|2 +-
 sc/source/core/data/documen8.cxx   |2 +-
 sc/source/core/data/document.cxx   |7 ++-
 sc/source/core/data/dpoutput.cxx   |2 +-
 sc/source/core/data/patattr.cxx|2 +-
 sc/source/core/data/stlpool.cxx|   16 ++--
 sc/source/core/data/stlsheet.cxx   |4 +++-
 sc/source/core/data/table1.cxx |2 +-
 sc/source/core/data/table5.cxx |2 +-
 sc/source/core/tool/autoform.cxx   |4 ++--
 sc/source/core/tool/stylehelper.cxx|4 ++--
 sc/source/filter/excel/impop.cxx   |2 +-
 sc/source/filter/excel/xestyle.cxx |4 ++--
 sc/source/filter/excel/xistyle.cxx |6 +++---
 sc/source/filter/excel/xltools.cxx |4 ++--
 sc/source/filter/html/htmlexp.cxx  |2 +-
 sc/source/filter/oox/stylesbuffer.cxx  |6 +++---
 sc/source/ui/condformat/condformatdlgentry.cxx |2 +-
 sc/source/ui/docshell/docsh4.cxx   |2 +-
 sc/source/ui/unoobj/cellsuno.cxx   |4 ++--
 sc/source/ui/unoobj/styleuno.cxx   |2 +-
 26 files changed, 53 insertions(+), 41 deletions(-)

New commits:
commit 4111ed76906bf6be05b704bf52fa91353dfef183
Author: Srijan Bhatia 
AuthorDate: Tue Jun 2 18:09:20 2020 +0530
Commit: Heiko Tietze 
CommitDate: Wed Jun 10 12:55:17 2020 +0200

tdf#132137 Rename Default Style in Calc.

Change-Id: I0f7c5ffc64b2387fbb63bb5724594480d3135f58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95484
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index d393739292e5..063d51a3d2ec 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -269,7 +269,8 @@
 #define STR_EXPORT_DBF  NC_("STR_EXPORT_DBF", "DBase 
export")
 #define STR_EXPORT_DIF  NC_("STR_EXPORT_DIF", "Dif 
Export")
 #define STR_IMPORT_DIF  NC_("STR_IMPORT_DIF", "Dif 
Import")
-#define STR_STYLENAME_STANDARD  NC_("STR_STYLENAME_STANDARD", 
"Default")
+#define STR_STYLENAME_STANDARD_CELL NC_("STR_STYLENAME_STANDARD", 
"Default Cell Style")
+#define STR_STYLENAME_STANDARD_PAGE NC_("STR_STYLENAME_STANDARD", 
"Default Page Style")
 #define STR_STYLENAME_RESULTNC_("STR_STYLENAME_RESULT", 
"Result")
 #define STR_STYLENAME_RESULT1   NC_("STR_STYLENAME_RESULT1", 
"Result2")
 #define STR_STYLENAME_HEADLINE  NC_("STR_STYLENAME_HEADLINE", 
"Heading")
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index 76db8c6a3592..23abaa956f1c 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -88,7 +88,7 @@ ScAutoFormatObj::ScAutoFormatObj()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 , XElementAccess(cppu::UnoType::get())
 , XIndexAccess(16)
-, XNamed("Default")
+, XNamed("Default Cell Style")
 , XServiceInfo("ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat")
 {
 }
diff --git a/sc/qa/extras/scautoformatsobj.cxx 
b/sc/qa/extras/scautoformatsobj.cxx
index ed799c018ef4..769478608506 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -89,7 +89,7 @@ ScAutoFormatsObj::ScAutoFormatsObj()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 , XElementAccess(cppu::UnoType::get())
 , XIndexAccess(2)
-, XNameAccess("Default")
+, XNameAccess("Default Cell Style")
 , XNameContainer("ScAutoFormatsObj")
 , XNameReplace("ScAutoFormatsObj")
 , XServiceInfo("stardiv.StarCalc.ScAutoFormatsObj", 
"com.sun.star.sheet.TableAutoFormats")
diff --git a/sc/qa/uitest/calc_tests6/tdf91726.py 
b/sc/qa/uitest/calc_tests6/tdf91726.py
index 38703cb7e34a..4dccc7c697ec 100644
--- a/sc/qa/uitest/calc_tests6/tdf91726.py
+++ b/sc/qa/uitest/calc_tests6/tdf91726.py
@@ -28,7 +28,7 @@ class tdf91726(UITestCase):
 xadd = xDialog.getChild("add")
 def handle_name_dlg(dialog):
 nameEntry = dialog.getChild("name_entry")
-nameEntry.executeAction("TYPE", 
mkPropertyValues({"TEXT":"Default"}))
+nameEntry.executeAction("TYPE", mkPropertyValues({"TEXT":"Default 
Cell Style"}))
 xOKBtn = dialog.getChild("ok")
 def handle_error_dlg(dialog2):
 #Error message: You have entered an invalid name.
@@ -43,7 +43,7 @@ class tdf91726(UITestCase):
 xDialog = self.xUITest.getTopFocusWindow()

[Libreoffice-commits] core.git: sd/inc

2020-06-04 Thread Srijan Bhatia (via logerrit) 
 sd/inc/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4949050c43300eee047531d856bd4a25e60980c3
Author: Srijan Bhatia 
AuthorDate: Sat May 30 21:17:14 2020 +0530
Commit: Heiko Tietze 
CommitDate: Thu Jun 4 11:59:07 2020 +0200

tdf#132137 Rename Default Style to Default Drawing Style in Draw and 
Impress.

Change-Id: I130bd0e070a3449753cc76a8f7e6352c8b7a1bba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95403
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 54c6d81362a6..0e093d1da84b 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -318,7 +318,7 @@
 #define STR_PRESOBJ_TABLE   
NC_("STR_PRESOBJ_TABLE", "Double-click to add a Spreadsheet" )
 #define STR_LAYOUT_DEFAULT_NAME 
NC_("STR_LAYOUT_DEFAULT_NAME", "Default" )
 #define STR_LAYOUT_DEFAULT_TITLE_NAME   
NC_("STR_LAYOUT_DEFAULT_TITLE_NAME", "Title" )
-#define STR_STANDARD_STYLESHEET_NAME
NC_("STR_STANDARD_STYLESHEET_NAME", "Default" )
+#define STR_STANDARD_STYLESHEET_NAME
NC_("STR_STANDARD_STYLESHEET_NAME", "Default Drawing Style" )
 #define STR_UNDO_MOVEPAGES  
NC_("STR_UNDO_MOVEPAGES", "Move slides" )
 #define STR_INSERT_PAGES
NC_("STR_INSERT_PAGES", "Insert Pages" )
 #define STR_INSERT_PAGE_DRAW
NC_("STR_INSERT_PAGE_DRAW", "Insert Page" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits