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

[Rafael Lima (via logerrit)]

 basctl/inc/strings.hrc  |3 +++
 basctl/source/basicide/baside2.cxx  |3 +++
 basctl/source/basicide/baside2b.cxx |7 +++
 basctl/source/basicide/basides1.cxx |2 ++
 basctl/source/basicide/bastypes.cxx |   24 
 basctl/source/inc/bastypes.hxx  |1 +
 6 files changed, 40 insertions(+)

New commits:
commit d466df5bc220eb80b8a51ff64507de881b938ed3
Author: Rafael Lima 
AuthorDate: Wed Jan 11 14:46:07 2023 +
Commit: Rafael Lima 
CommitDate: Mon Jan 16 11:28:35 2023 +

tdf#106731 Warn user that a module/dialog is read-only in Basic IDE

As discussed in the ticket the Basic IDE does not make it clear that the 
currently opened module is read-only, which can cause confusion to the user, 
since they may be pressing keys and seeing no result.

With this patch the IDE clarifies that the module/dialog is read-only in 
two ways:
1) In the status bar the string "(Read-only)" is added after the 
module/dialog name
2) When a module/dialog is opened an infobar is shown warning that it is 
read-only.
3) In a module, if the user closed the infobar and tries to edit the code, 
the infobar is shown again.

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

diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
index 09190a0b895d..1384e95b72df 100644
--- a/basctl/inc/strings.hrc
+++ b/basctl/inc/strings.hrc
@@ -110,6 +110,9 @@
 #define RID_STR_EXPORTPACKAGE   NC_("RID_STR_EXPORTPACKAGE", 
"Export library as extension")
 #define RID_STR_EXPORTBASIC NC_("RID_STR_EXPORTBASIC", "Export 
as BASIC library")
 #define RID_STR_PACKAGE_BUNDLE  NC_("RID_STR_PACKAGE_BUNDLE", 
"Extension")
+#define RID_STR_READONLYNC_("RID_STR_READONLY", 
"Read-only")
+#define RID_STR_MODULE_READONLY NC_("RID_STR_READONLY_WARNING", 
"This module is read-only and cannot be edited.")
+#define RID_STR_DIALOG_READONLY NC_("RID_STR_READONLY_WARNING", 
"This dialog is read-only and cannot be edited.")
 
 #endif
 
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 9452ef2162e5..3c184850d76b 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1130,6 +1130,9 @@ void ModulWindow::GetState( SfxItemSet  )
 if (!sProcName.isEmpty())
 aTitle += "." + sProcName;
 
+if (IsReadOnly())
+aTitle += " (" + IDEResId(RID_STR_READONLY) + ")";
+
 SfxStringItem aTitleItem( SID_BASICIDE_STAT_TITLE, aTitle 
);
 rSet.Put( aTitleItem );
 }
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index b5deee9b6a9e..e5de6abb4306 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -627,6 +627,13 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
 pBindings->Update( SID_BASICIDE_STAT_POS );
 pBindings->Update( SID_BASICIDE_STAT_TITLE );
 }
+if ( rKEvt.GetKeyCode().GetGroup() == KEYGROUP_ALPHA ||
+ rKEvt.GetKeyCode().GetGroup() == KEYGROUP_NUM )
+{
+// If the module is read-only, warn that it cannont be edited
+if ( rModulWindow.IsReadOnly() )
+rModulWindow.ShowReadOnlyInfoBar();
+}
 if ( !bWasModified && pEditEngine->IsModified() )
 {
 pBindings->Invalidate( SID_SAVEDOC );
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 430b795e162d..b870a14a92a5 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1019,6 +1019,8 @@ void Shell::GetState(SfxItemSet )
 if ( pCurWin )
 {
 OUString aTitle = pCurWin->CreateQualifiedName();
+if (pCurWin->IsReadOnly())
+aTitle += " (" + IDEResId(RID_STR_READONLY) + ")";
 SfxStringItem aItem( SID_BASICIDE_STAT_TITLE, aTitle );
 rSet.Put( aItem );
 }
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index c68209476a4f..0bf829b2bb5d 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -35,8 +35,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -51,6 +53,9 @@
 namespace basctl
 {
 
+// ID used for the read-only infobar
+constexpr OUStringLiteral BASIC_IDE_READONLY_INFOBAR = u"readonly";
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
@@ -87,6 +92,12 @@ 

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

[Caolán McNamara (via logerrit)]

 basctl/inc/pch/precompiled_basctl.hxx |5 ++---
 basctl/source/basicide/basides1.cxx   |   15 +++
 basctl/source/basicide/basidesh.cxx   |6 --
 basctl/source/dlged/dlged.cxx |1 -
 basctl/source/inc/basidesh.hxx|2 --
 5 files changed, 9 insertions(+), 20 deletions(-)

New commits:
commit 094572831b7e5fdc24d05f8244a70b4e9b4bb616
Author: Caolán McNamara 
AuthorDate: Mon Aug 8 12:07:06 2022 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 8 17:34:24 2022 +0200

these two scrollbars don't meet, so drop the junction box

Change-Id: I066a63910d7ad71c3777b26091ce527e4017017c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137974
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/basctl/inc/pch/precompiled_basctl.hxx 
b/basctl/inc/pch/precompiled_basctl.hxx
index 9728e1df71b2..d295cddfb343 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2022-06-27 18:59:37 using:
+ Generated on 2022-08-08 12:07:41 using:
  ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module 
--exclude:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -54,6 +54,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -70,7 +71,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -156,7 +156,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 70991525331a..3c5cbd0ec6af 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1353,16 +1353,15 @@ void Shell::AdjustPosSizePixel( const Point , 
const Size  )
 aTabBarSize.setWidth( rSize.Width() );
 
 Size aSz( rSize );
-Size aScrollBarBoxSz( aScrollBarBox->GetSizePixel() );
-aSz.AdjustHeight( -(aScrollBarBoxSz.Height()) );
-aSz.AdjustHeight( -(aTabBarSize.Height()) );
+auto 
nScrollBarSz(Application::GetSettings().GetStyleSettings().GetScrollBarSize());
+aSz.AdjustHeight(-nScrollBarSz);
+aSz.AdjustHeight(-aTabBarSize.Height());
 
 Size aOutSz( aSz );
-aSz.AdjustWidth( -(aScrollBarBoxSz.Width()) );
-aScrollBarBox->SetPosPixel( Point( rSize.Width() - 
aScrollBarBoxSz.Width(), rSize.Height() - aScrollBarBoxSz.Height() ) );
-aVScrollBar->SetPosSizePixel( Point( rPos.X()+aSz.Width(), rPos.Y() ), 
Size( aScrollBarBoxSz.Width(), aSz.Height() ) );
-aHScrollBar->SetPosSizePixel( Point( rPos.X(), rPos.Y()+aSz.Height() ), 
Size( aSz.Width(), aScrollBarBoxSz.Height() ) );
-pTabBar->SetPosSizePixel( Point( rPos.X(), 
rPos.Y()+aScrollBarBoxSz.Height()+aSz.Height()), aTabBarSize );
+aSz.AdjustWidth(-nScrollBarSz);
+aVScrollBar->SetPosSizePixel( Point( rPos.X()+aSz.Width(), rPos.Y() ), 
Size( nScrollBarSz, aSz.Height() ) );
+aHScrollBar->SetPosSizePixel( Point( rPos.X(), rPos.Y()+aSz.Height() ), 
Size( aOutSz.Width(), nScrollBarSz ) );
+pTabBar->SetPosSizePixel( Point( rPos.X(), rPos.Y() + nScrollBarSz + 
aSz.Height()), aTabBarSize );
 
 if (pLayout)
 pLayout->SetPosSizePixel(rPos, 
dynamic_cast(pCurWin.get()) ? aSz : aOutSz);
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index a075b1f8f2db..df083128fe49 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -161,7 +161,6 @@ Shell::Shell( SfxViewFrame* pFrame_, SfxViewShell* /* 
pOldShell */ ) :
 m_aCurDocument( ScriptDocument::getApplicationScriptDocument() ),
 aHScrollBar( VclPtr::Create(()->GetWindow(), 
true) ),
 aVScrollBar( VclPtr::Create(()->GetWindow(), 
false) ),
-aScrollBarBox( VclPtr::Create(()->GetWindow(), 
WinBits( WB_SIZEABLE )) ),
 pLayout(nullptr),
 
aObjectCatalog(VclPtr::Create(()->GetWindow())),
 m_bAppBasicModified( false ),
@@ -231,7 +230,6 @@ Shell::~Shell()
 SetCurWindow( nullptr );
 
 aObjectCatalog.disposeAndClear();
-aScrollBarBox.disposeAndClear();
 aVScrollBar.disposeAndClear();
 aHScrollBar.disposeAndClear();
 
@@ -414,10 +412,8 @@ void Shell::InitScrollBars()
 aVScrollBar->Enable();
 aVScrollBar->Show();
 aHScrollBar->Show();
-aScrollBarBox->Show();
 }
 
-
 void Shell::InitTabBar()
 {
 pTabBar->Enable();
@@ -425,13 +421,11 @@ void Shell::InitTabBar()
 pTabBar->SetSelectHdl( LINK( this, Shell, TabBarHdl ) );
 }
 
-
 void Shell::OuterResizePixel( const Point , const Size  )
 {
 AdjustPosSizePixel( rPos, rSize );
 }
 
-
 IMPL_LINK( Shell, TabBarHdl, ::TabBar *, pCurTabBar, void )
 {
 sal_uInt16 nCurId = pCurTabBar->GetCurPageId();
diff --git a/basctl/source/dlged/dlged.cxx 

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

[Noel Grandin (via logerrit)]

 basctl/inc/bitmaps.hlst |   28 ++--
 basctl/inc/helpids.h|   26 ++
 basctl/inc/strings.hxx  |   50 ++--
 basctl/source/basicide/baside2.cxx  |2 -
 basctl/source/basicide/baside2.hxx  |2 -
 basctl/source/basicide/baside2b.cxx |2 -
 basctl/source/basicide/baside3.cxx  |2 -
 basctl/source/basicide/bastype2.cxx |4 +-
 basctl/source/basicide/bastype3.cxx |4 +-
 basctl/source/basicide/moduldl2.cxx |4 +-
 basctl/source/inc/baside3.hxx   |2 -
 basctl/source/inc/bastypes.hxx  |2 -
 basctl/source/inc/dlgeddef.hxx  |   24 -
 13 files changed, 77 insertions(+), 75 deletions(-)

New commits:
commit 0011ed25344673d441e2ac59f455428b27fea9d3
Author: Noel Grandin 
AuthorDate: Thu Nov 18 14:01:23 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 18 19:46:19 2021 +0100

loplugin:stringliteraldefine in basctl

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

diff --git a/basctl/inc/bitmaps.hlst b/basctl/inc/bitmaps.hlst
index 11d35b289d58..b316a2450a39 100644
--- a/basctl/inc/bitmaps.hlst
+++ b/basctl/inc/bitmaps.hlst
@@ -9,19 +9,19 @@
 
 #pragma once
 
-#define RID_BMP_BRKENABLED  "res/im30838.png"
-#define RID_BMP_BRKDISABLED "res/im30839.png"
-#define RID_BMP_STEPMARKER  "res/im30840.png"
-#define RID_BMP_ERRORMARKER "res/im30841.png"
-#define RID_BMP_LOCKED  "res/lock.png"
-#define RID_BMP_INSTALLATION"res/harddisk_16.png"
-#define RID_BMP_DOCUMENT"res/im30826.png"
-#define RID_BMP_MODLIB  "res/im30820.png"
-#define RID_BMP_MODLIBNOTLOADED "res/im30827.png"
-#define RID_BMP_MODULE  "res/im30821.png"
-#define RID_BMP_MACRO   "res/im30822.png"
-#define RID_BMP_DLGLIB  "res/dialogfolder_16.png"
-#define RID_BMP_DLGLIBNOTLOADED "res/dialogfoldernot_16.png"
-#define RID_BMP_DIALOG  "res/im30823.png"
+inline constexpr OUStringLiteral RID_BMP_BRKENABLED = u"res/im30838.png";
+inline constexpr OUStringLiteral RID_BMP_BRKDISABLED = u"res/im30839.png";
+inline constexpr OUStringLiteral RID_BMP_STEPMARKER = u"res/im30840.png";
+inline constexpr OUStringLiteral RID_BMP_ERRORMARKER = u"res/im30841.png";
+inline constexpr OUStringLiteral RID_BMP_LOCKED = u"res/lock.png";
+inline constexpr OUStringLiteral RID_BMP_INSTALLATION = u"res/harddisk_16.png";
+inline constexpr OUStringLiteral RID_BMP_DOCUMENT = u"res/im30826.png";
+inline constexpr OUStringLiteral RID_BMP_MODLIB = u"res/im30820.png";
+inline constexpr OUStringLiteral RID_BMP_MODLIBNOTLOADED = u"res/im30827.png";
+inline constexpr OUStringLiteral RID_BMP_MODULE = u"res/im30821.png";
+inline constexpr OUStringLiteral RID_BMP_MACRO = u"res/im30822.png";
+inline constexpr OUStringLiteral RID_BMP_DLGLIB = u"res/dialogfolder_16.png";
+inline constexpr OUStringLiteral RID_BMP_DLGLIBNOTLOADED = 
u"res/dialogfoldernot_16.png";
+inline constexpr OUStringLiteral RID_BMP_DIALOG = u"res/im30823.png";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/basctl/inc/helpids.h b/basctl/inc/helpids.h
index 13e59eb7ef88..28b855ffb602 100644
--- a/basctl/inc/helpids.h
+++ b/basctl/inc/helpids.h
@@ -18,20 +18,22 @@
  */
 #pragma once
 
-#define HID_BASICIDE_OBJECTCAT
"BASCTL_HID_BASICIDE_OBJECTCAT"
+#include 
 
-#define HID_BASICIDE_REMOVEWATCH  
"BASCTL_HID_BASICIDE_REMOVEWATCH"
+inline constexpr OStringLiteral HID_BASICIDE_OBJECTCAT = 
"BASCTL_HID_BASICIDE_OBJECTCAT";
 
-#define HID_BASICIDE_MODULWINDOW  
"BASCTL_HID_BASICIDE_MODULWINDOW"
-#define HID_BASICIDE_DIALOGWINDOW 
"BASCTL_HID_BASICIDE_DIALOGWINDOW"
+inline constexpr OStringLiteral HID_BASICIDE_REMOVEWATCH = 
"BASCTL_HID_BASICIDE_REMOVEWATCH";
 
-#define HID_BASICIDE_EDITORWINDOW 
"BASCTL_HID_BASICIDE_EDITORWINDOW"
-#define HID_BASICIDE_BREAKPOINTWINDOW 
"BASCTL_HID_BASICIDE_BREAKPOINTWINDOW"
-#define HID_BASICIDE_WATCHWINDOW  
"BASCTL_HID_BASICIDE_WATCHWINDOW"
-#define HID_BASICIDE_STACKWINDOW  
"BASCTL_HID_BASICIDE_STACKWINDOW"
-#define HID_BASICIDE_TABBAR   
"BASCTL_HID_BASICIDE_TABBAR"
-#define HID_BASICIDE_WATCHWINDOW_EDIT 
"BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT"
-#define HID_BASICIDE_WATCHWINDOW_LIST 
"BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"
-#define HID_BASICIDE_STACKWINDOW_LIST 
"BASCTL_HID_BASICIDE_STACKWINDOW_LIST"
+inline constexpr OStringLiteral HID_BASICIDE_MODULWINDOW = 
"BASCTL_HID_BASICIDE_MODULWINDOW";
+inline constexpr OStringLiteral HID_BASICIDE_DIALOGWINDOW = 
"BASCTL_HID_BASICIDE_DIALOGWINDOW";
+
+inline 

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

[George Bateman (via logerrit)]

 basctl/inc/bitmaps.hlst  |5 +
 basctl/inc/helpids.h |5 +
 basctl/source/inc/IDEComboBox.hxx|5 +
 basctl/source/inc/ObjectCatalog.hxx  |5 +
 basctl/source/inc/accessibledialogwindow.hxx |5 +
 basctl/source/inc/basidectrlr.hxx|5 +
 basctl/source/inc/basidesh.hxx   |5 +
 basctl/source/inc/basobj.hxx |5 +
 basctl/source/inc/bastype2.hxx   |5 +
 basctl/source/inc/bastypes.hxx   |5 +
 basctl/source/inc/dlged.hxx  |5 +
 basctl/source/inc/dlgedclip.hxx  |5 +
 basctl/source/inc/dlgeddef.hxx   |5 +
 basctl/source/inc/dlgedfac.hxx   |5 +
 basctl/source/inc/dlgedfunc.hxx  |5 +
 basctl/source/inc/dlgedlist.hxx  |5 +
 basctl/source/inc/dlgedmod.hxx   |5 +
 basctl/source/inc/dlgedobj.hxx   |5 +
 basctl/source/inc/dlgedpage.hxx  |5 +
 basctl/source/inc/dlgedview.hxx  |5 +
 basctl/source/inc/doceventnotifier.hxx   |5 +
 basctl/source/inc/docsignature.hxx   |5 +
 basctl/source/inc/iderid.hxx |5 +
 basctl/source/inc/layout.hxx |5 +
 basctl/source/inc/localizationmgr.hxx|5 +
 basctl/source/inc/managelang.hxx |5 +
 basctl/source/inc/propbrw.hxx|5 +
 basctl/source/inc/sbxitem.hxx|5 +
 basctl/source/inc/scriptdocument.hxx |5 +
 29 files changed, 29 insertions(+), 116 deletions(-)

New commits:
commit abea8319622848f2228fc9a2736a645b52ab617b
Author: George Bateman 
AuthorDate: Tue Aug 4 21:03:59 2020 +
Commit: Julien Nabet 
CommitDate: Fri Sep 4 08:58:07 2020 +0200

tdf#124176 Use #pragma once in basctl

This commit was carried out by a Python script, source of which
is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97.

Change-Id: I812869f1a7cb2ac3e9c97240abc456cd12afd0b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100121
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/basctl/inc/bitmaps.hlst b/basctl/inc/bitmaps.hlst
index 997760aaf326..11d35b289d58 100644
--- a/basctl/inc/bitmaps.hlst
+++ b/basctl/inc/bitmaps.hlst
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_BASCTL_INC_BITMAPS_HRC
-#define INCLUDED_BASCTL_INC_BITMAPS_HRC
+#pragma once
 
 #define RID_BMP_BRKENABLED  "res/im30838.png"
 #define RID_BMP_BRKDISABLED "res/im30839.png"
@@ -25,6 +24,4 @@
 #define RID_BMP_DLGLIBNOTLOADED "res/dialogfoldernot_16.png"
 #define RID_BMP_DIALOG  "res/im30823.png"
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/basctl/inc/helpids.h b/basctl/inc/helpids.h
index 1753df0a9ab5..13e59eb7ef88 100644
--- a/basctl/inc/helpids.h
+++ b/basctl/inc/helpids.h
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_BASCTL_INC_HELPIDS_H
-#define INCLUDED_BASCTL_INC_HELPIDS_H
+#pragma once
 
 #define HID_BASICIDE_OBJECTCAT
"BASCTL_HID_BASICIDE_OBJECTCAT"
 
@@ -35,6 +34,4 @@
 #define HID_BASICIDE_WATCHWINDOW_LIST 
"BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"
 #define HID_BASICIDE_STACKWINDOW_LIST 
"BASCTL_HID_BASICIDE_STACKWINDOW_LIST"
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/IDEComboBox.hxx 
b/basctl/source/inc/IDEComboBox.hxx
index 220a6f84b1f0..76d73cdf8eec 100644
--- a/basctl/source/inc/IDEComboBox.hxx
+++ b/basctl/source/inc/IDEComboBox.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASICBOX_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICBOX_HXX
+#pragma once
 
 #include 
 #include 
@@ -273,6 +272,4 @@ private:
 
 } // namespace basctl
 
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_BASICBOX_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/ObjectCatalog.hxx 
b/basctl/source/inc/ObjectCatalog.hxx
index 6ef3d639001b..a5b63eef424a 100644
--- a/basctl/source/inc/ObjectCatalog.hxx
+++ b/basctl/source/inc/ObjectCatalog.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASCTL_SOURCE_INC_OBJDLG_HXX
-#define INCLUDED_BASCTL_SOURCE_INC_OBJDLG_HXX
+#pragma once
 
 #include "bastype2.hxx"
 #include "bastypes.hxx"
@@ -58,6 +57,4 @@ private:
 
 } // namespace basctl
 
-#endif // INCLUDED_BASCTL_SOURCE_INC_OBJDLG_HXX
-
 /* vim:set shiftwidth=4 

[Libreoffice-commits] core.git: basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk include/vcl solenv/clang-format solenv/sanitizers vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 basctl/UIConfig_basicide.mk |1 
 basctl/inc/bitmaps.hlst |1 
 basctl/inc/pch/precompiled_basctl.hxx   |8 
 basctl/inc/strings.hrc  |3 
 basctl/source/basicide/baside2.cxx  |1 
 basctl/source/basicide/baside2.hxx  |   65 +--
 basctl/source/basicide/baside2b.cxx |  535 
 basctl/source/basicide/basides2.cxx |1 
 basctl/source/basicide/basidesh.cxx |1 
 basctl/source/basicide/bastype3.hxx |   45 --
 basctl/source/basicide/bastypes.cxx |   23 -
 basctl/uiconfig/basicide/ui/dockingwatch.ui |  161 
 include/vcl/svtabbx.hxx |1 
 include/vcl/weld.hxx|2 
 solenv/clang-format/blacklist   |1 
 solenv/sanitizers/ui/modules/BasicIDE.suppr |1 
 vcl/source/app/salvtables.cxx   |   23 +
 vcl/source/treelist/svtabbx.cxx |   12 
 vcl/unx/gtk3/gtk3gtkinst.cxx|   48 ++
 19 files changed, 517 insertions(+), 416 deletions(-)

New commits:
commit 4e07b178f58b1dabbb48bc9f26155b8270a4a72d
Author: Caolán McNamara 
AuthorDate: Tue Feb 18 10:16:40 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 19 09:52:51 2020 +0100

weld WatchWindow panel

Change-Id: Idb43d7bd168ce37fce8694946be6c7de7ca5a2c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88930
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 411223416500..9c879545044d 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/dialogpage \
basctl/uiconfig/basicide/ui/dockingorganizer \
basctl/uiconfig/basicide/ui/dockingstack \
+   basctl/uiconfig/basicide/ui/dockingwatch \
basctl/uiconfig/basicide/ui/exportdialog \
basctl/uiconfig/basicide/ui/gotolinedialog \
basctl/uiconfig/basicide/ui/importlibdialog \
diff --git a/basctl/inc/bitmaps.hlst b/basctl/inc/bitmaps.hlst
index 3dd019785a67..997760aaf326 100644
--- a/basctl/inc/bitmaps.hlst
+++ b/basctl/inc/bitmaps.hlst
@@ -24,7 +24,6 @@
 #define RID_BMP_DLGLIB  "res/dialogfolder_16.png"
 #define RID_BMP_DLGLIBNOTLOADED "res/dialogfoldernot_16.png"
 #define RID_BMP_DIALOG  "res/im30823.png"
-#define RID_BMP_REMOVEWATCH "res/baswatr.png"
 
 #endif
 
diff --git a/basctl/inc/pch/precompiled_basctl.hxx 
b/basctl/inc/pch/precompiled_basctl.hxx
index 6a8c8065274b..3601ccaf130f 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-02-16 15:31:09 using:
+ Generated on 2020-02-18 11:59:52 using:
  ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module 
--exclude:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -101,7 +101,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -137,12 +136,10 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -156,8 +153,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -471,7 +466,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
index 6487c607694a..b31ddd20922d 100644
--- a/basctl/inc/strings.hrc
+++ b/basctl/inc/strings.hrc
@@ -61,9 +61,6 @@
 #define RID_STR_REPLACESTDLIB   NC_("RID_STR_REPLACESTDLIB", "The 
default library cannot be replaced.")
 #define RID_STR_REFNOTPOSSIBLE  NC_("RID_STR_REFNOTPOSSIBLE", 
"Reference to 'XX' not possible.")
 #define RID_STR_WATCHNAME   NC_("RID_STR_WATCHNAME", "Watch")
-#define RID_STR_WATCHVARIABLE   NC_("RID_STR_WATCHVARIABLE", 
"Variable")
-#define RID_STR_WATCHVALUE  NC_("RID_STR_WATCHVALUE", "Value")
-#define RID_STR_WATCHTYPE   NC_("RID_STR_WATCHTYPE", "Type")
 #define RID_STR_STACKNAME   NC_("RID_STR_STACKNAME", "Call 
Stack")
 #define RID_STR_STDDIALOGNAME   NC_("RID_STR_STDDIALOGNAME", 
"Dialog")
 #define RID_STR_NEWLIB  NC_("RID_STR_NEWLIB", "New 
Library")
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 476ade8dc40a..d07aa96dda2f 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git 

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

[Caolán McNamara (via logerrit)]

 basctl/inc/pch/precompiled_basctl.hxx |9 +++--
 basctl/source/basicide/bastype2.cxx   |1 -
 basctl/source/basicide/bastype3.cxx   |3 ---
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit b8d0c50eff51ebe919680a2023ae807973674f75
Author: Caolán McNamara 
AuthorDate: Wed Feb 12 16:05:08 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 13 09:48:36 2020 +0100

remove unneeded includes and update pch

Change-Id: I6b38e96e6eb509e9d1ea0acaf30cb2a542bdbc2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88546
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/basctl/inc/pch/precompiled_basctl.hxx 
b/basctl/inc/pch/precompiled_basctl.hxx
index 64dc508a07c3..4e043ce70aa5 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-02-07 17:31:33 using:
+ Generated on 2020-02-12 16:02:54 using:
  ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module 
--exclude:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -101,6 +101,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -140,10 +141,12 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -160,7 +163,8 @@
 #include 
 #include 
 #include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -479,6 +483,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 7754bd5792ab..4efdb2c1be41 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/basctl/source/basicide/bastype3.cxx 
b/basctl/source/basicide/bastype3.cxx
index d54d635db981..ec19714b5aac 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -36,8 +35,6 @@ namespace basctl
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
-typedef std::deque< SvTreeListEntry* > EntryArray;
-
 IMPL_LINK(SbTreeListBox, RequestingChildrenHdl, const weld::TreeIter&, rEntry, 
bool)
 {
 EntryDescriptor aDesc = GetEntryDescriptor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk

[Caolán McNamara (via logerrit)]

 basctl/UIConfig_basicide.mk |1 
 basctl/inc/pch/precompiled_basctl.hxx   |3 
 basctl/source/basicide/IDEComboBox.cxx  |  227 +---
 basctl/source/inc/IDEComboBox.hxx   |   30 +++-
 basctl/uiconfig/basicide/ui/combobox.ui |   23 +++
 5 files changed, 176 insertions(+), 108 deletions(-)

New commits:
commit 9d4f31de3e2cb25d94a47b29e3bea0133372c65d
Author: Caolán McNamara 
AuthorDate: Fri Feb 7 16:00:49 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 8 20:29:52 2020 +0100

weld LibBox and LanguageBox Item Windows

Change-Id: Ifdbef243093b57c3d3fe1efcaf2e4c7c982a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88235
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 97ced734236a..874c1cff4e9c 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
 $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
basctl/uiconfig/basicide/ui/breakpointmenus \
+   basctl/uiconfig/basicide/ui/combobox \
basctl/uiconfig/basicide/ui/defaultlanguage \
basctl/uiconfig/basicide/ui/deletelangdialog \
basctl/uiconfig/basicide/ui/dialogpage \
diff --git a/basctl/inc/pch/precompiled_basctl.hxx 
b/basctl/inc/pch/precompiled_basctl.hxx
index 8c25e3543e5a..64dc508a07c3 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-02-05 19:54:23 using:
+ Generated on 2020-02-07 17:31:33 using:
  ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module 
--exclude:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -134,6 +134,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/basctl/source/basicide/IDEComboBox.cxx 
b/basctl/source/basicide/IDEComboBox.cxx
index 93daa7771548..240eafb63d39 100644
--- a/basctl/source/basicide/IDEComboBox.cxx
+++ b/basctl/source/basicide/IDEComboBox.cxx
@@ -73,10 +73,10 @@ void LibBoxControl::StateChanged(sal_uInt16, SfxItemState 
eState, const SfxPoolI
 return;
 
 if (eState != SfxItemState::DEFAULT)
-pBox->Disable();
+pBox->set_sensitive(false);
 else
 {
-pBox->Enable();
+pBox->set_sensitive(true);
 pBox->Update(dynamic_cast(pState));
 }
 }
@@ -87,17 +87,36 @@ VclPtr 
LibBoxControl::CreateItemWindow(vcl::Window* pParent)
 }
 
 DocListenerBox::DocListenerBox(vcl::Window* pParent)
-: ListBox(pParent, WinBits(WB_BORDER | WB_DROPDOWN))
+: InterimItemWindow(pParent, "modules/BasicIDE/ui/combobox.ui", "ComboBox")
+, m_xWidget(m_xBuilder->weld_combo_box("combobox"))
 , maNotifier(*this)
 {
+m_xWidget->connect_changed(LINK(this, DocListenerBox, SelectHdl));
+m_xWidget->connect_key_press(LINK(this, DocListenerBox, KeyInputHdl));
 }
 
+void DocListenerBox::set_sensitive(bool bSensitive)
+{
+Enable(bSensitive);
+m_xWidget->set_sensitive(bSensitive);
+}
+
+IMPL_LINK(DocListenerBox, KeyInputHdl, const KeyEvent&, rKEvt, bool)
+{
+return HandleKeyInput(rKEvt);
+}
+
+bool DocListenerBox::HandleKeyInput(const KeyEvent& rKEvt) { return 
ChildKeyInput(rKEvt); }
+
+IMPL_LINK_NOARG(DocListenerBox, SelectHdl, weld::ComboBox&, void) { Select(); }
+
 DocListenerBox::~DocListenerBox() { disposeOnce(); }
 
 void DocListenerBox::dispose()
 {
 maNotifier.dispose();
-ListBox::dispose();
+m_xWidget.reset();
+InterimItemWindow::dispose();
 }
 
 /// Only calls FillBox(). Parameter is not used.
@@ -133,10 +152,14 @@ LibBox::LibBox(vcl::Window* pParent)
 FillBox();
 mbIgnoreSelect = true; // do not yet transfer select of 0
 mbFillBox = true;
-SelectEntryPos(0);
-maCurrentText = GetEntry(0);
-SetSizePixel(Size(250, 200));
+m_xWidget->set_active(0);
+maCurrentText = m_xWidget->get_text(0);
 mbIgnoreSelect = false;
+
+m_xWidget->connect_focus_in(LINK(this, LibBox, FocusInHdl));
+m_xWidget->connect_focus_out(LINK(this, LibBox, FocusOutHdl));
+
+SetSizePixel(m_xWidget->get_preferred_size());
 }
 
 LibBox::~LibBox() { disposeOnce(); }
@@ -159,8 +182,8 @@ void LibBox::Update(const SfxStringItem* pItem)
 maCurrentText = IDEResId(RID_STR_ALL);
 }
 
-if (GetSelectedEntry() != maCurrentText)
-SelectEntry(maCurrentText);
+if (m_xWidget->get_active_text() != maCurrentText)
+m_xWidget->set_active_text(maCurrentText);
 }
 
 void LibBox::ReleaseFocus()
@@ -180,18 +203,20 @@ void LibBox::ReleaseFocus()
 
 void LibBox::FillBox()
 {
-

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

[ayhanyalcinsoy (via logerrit)]

 basctl/inc/iderdll.hxx |5 +
 basctl/inc/strings.hxx |5 +
 basctl/source/basicide/basdoc.hxx  |5 +
 basctl/source/basicide/basicmod.hxx|5 +
 basctl/source/basicide/basicrenderable.hxx |5 +
 5 files changed, 5 insertions(+), 20 deletions(-)

New commits:
commit 33bc192286c0f499c0d420b0e6f4a5d8ffbb9bf7
Author: ayhanyalcinsoy 
AuthorDate: Sun Dec 22 01:30:32 2019 +0300
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jan 27 10:38:34 2020 +0100

tdf#124176:Use pragma once instead of include guards

Change-Id: Ie00f05a3661a9fd6159c424e01f11e7bb1ea45fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85640
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/basctl/inc/iderdll.hxx b/basctl/inc/iderdll.hxx
index 0087c915053c..ef8f28763e68 100644
--- a/basctl/inc/iderdll.hxx
+++ b/basctl/inc/iderdll.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASCTL_INC_IDERDLL_HXX
-#define INCLUDED_BASCTL_INC_IDERDLL_HXX
+#pragma once
 
 namespace basctl
 {
@@ -36,6 +35,4 @@ ExtraData* GetExtraData();
 
 } // namespace basctl
 
-#endif // INCLUDED_BASCTL_INC_IDERDLL_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/inc/strings.hxx b/basctl/inc/strings.hxx
index fe12c7c0125b..fc04eae43dc1 100644
--- a/basctl/inc/strings.hxx
+++ b/basctl/inc/strings.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_BASCTL_INC_STRINGS_HRC
-#define INCLUDED_BASCTL_INC_STRINGS_HRC
+#pragma once
 
 // Dialog Controls 
---
 
@@ -38,6 +37,4 @@
 #define RID_STR_CLASS_SPINCONTROL   "SpinButton"
 #define RID_STR_CLASS_HYPERLINKCONTROL  "HyperlinkControl"
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/basctl/source/basicide/basdoc.hxx 
b/basctl/source/basicide/basdoc.hxx
index 897ce265b1a3..d5b3aabcf961 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASDOC_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_BASDOC_HXX
+#pragma once
 
 #include 
 #include 
@@ -65,6 +64,4 @@ public:
 // because I don't know how to use nested names in it.
 typedef basctl::DocShell basctl_DocShell;
 
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_BASDOC_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicmod.hxx 
b/basctl/source/basicide/basicmod.hxx
index d94a2198d440..c15d53d85738 100644
--- a/basctl/source/basicide/basicmod.hxx
+++ b/basctl/source/basicide/basicmod.hxx
@@ -18,8 +18,7 @@
  */
 
 
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASICMOD_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICMOD_HXX
+#pragma once
 
 #include 
 
@@ -37,6 +36,4 @@ public:
 
 } // namespace basctl
 
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_BASICMOD_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicrenderable.hxx 
b/basctl/source/basicide/basicrenderable.hxx
index 2618e5faa9d2..638749c64982 100644
--- a/basctl/source/basicide/basicrenderable.hxx
+++ b/basctl/source/basicide/basicrenderable.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX
+#pragma once
 
 #include 
 #include 
@@ -64,6 +63,4 @@ public:
 
 } // namespace basctl
 
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 basctl/inc/strings.hrc |8 
 basctl/source/basicide/basicrenderable.cxx |   14 
 sc/inc/strings.hrc |8 
 sc/source/ui/unoobj/docuno.cxx |   16 
 sd/inc/DocumentRenderer.hrc|   20 
 sd/source/ui/view/DocumentRenderer.cxx |   24 
 sw/inc/strings.hrc |   10 
 sw/source/core/view/printdata.cxx  |   41 
 vcl/uiconfig/ui/printdialog.ui | 1353 +++--
 9 files changed, 816 insertions(+), 678 deletions(-)

New commits:
commit 044fa501e95dcac8120767996dfb7ba8f25a703f
Author: heiko tietze 
AuthorDate: Tue Mar 5 15:08:53 2019 +0100
Commit: Heiko Tietze 
CommitDate: Thu Mar 14 16:03:23 2019 +0100

Resolves tdf#122707 - Replace listbox for print range by radio buttons

Some changes to the ui file (GtkGrid, alignment, radio buttons),
setChoiceRadiosControlOpt() instead of *list
Labels adjusted accordingly
Patch partially reverts I62bd9affc9e065d7afcc60296a72eae4612b0ddd

Change-Id: Ia06b8f2513d98fbdb1971477cf7b7127595d338c
Reviewed-on: https://gerrit.libreoffice.org/68846
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
index 6e93d8649f83..6487c607694a 100644
--- a/basctl/inc/strings.hrc
+++ b/basctl/inc/strings.hrc
@@ -98,10 +98,10 @@
 #define RID_STR_DLGIMP_MISMATCH_TITLE   
NC_("RID_STR_DLGIMP_MISMATCH_TITLE", "Dialog Import - Language Mismatch")
 #define RID_STR_DLGIMP_MISMATCH_TEXT
NC_("RID_STR_DLGIMP_MISMATCH_TEXT", "The dialog to be imported supports other 
languages than the target library.\n\nAdd these languages to the library to 
keep additional language resources provided by the dialog or omit them to stay 
with the current library languages.\n\nNote: For languages not supported by the 
dialog the resources of the dialog's default language will be used.\n ")
 #define RID_STR_PRINTDLG_PAGES  NC_("RID_STR_PRINTDLG_PAGES", 
"Pages:")
-#define RID_STR_PRINTDLG_PRINTALLPAGES  
NC_("RID_STR_PRINTDLG_PRINTALLPAGES", "Print all pages")
-#define RID_STR_PRINTDLG_PRINTPAGES NC_("RID_STR_PRINTDLG_PRINTPAGES", 
"Print pages")
-#define RID_STR_PRINTDLG_PRINTEVENPAGES 
NC_("RID_STR_PRINTDLG_PRINTEVENPAGES", "Print even pages")
-#define RID_STR_PRINTDLG_PRINTODDPAGES  
NC_("RID_STR_PRINTDLG_PRINTODDPAGES", "Print odd pages")
+#define RID_STR_PRINTDLG_PRINTALLPAGES  
NC_("RID_STR_PRINTDLG_PRINTALLPAGES", "All ~Pages")
+#define RID_STR_PRINTDLG_PRINTPAGES NC_("RID_STR_PRINTDLG_PRINTPAGES", 
"Pa~ges:")
+#define RID_STR_PRINTDLG_PRINTEVENPAGES 
NC_("RID_STR_PRINTDLG_PRINTEVENPAGES", "~Even pages")
+#define RID_STR_PRINTDLG_PRINTODDPAGES  
NC_("RID_STR_PRINTDLG_PRINTODDPAGES", "~Odd pages")
 #define RID_STR_CHOOSE  NC_("RID_STR_CHOOSE", "Choose")
 #define RID_STR_RUN NC_("RID_STR_RUN", "Run")
 #define RID_STR_RECORD  NC_("RID_STR_RECORD", "~Save")
diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index 7913c8a10d75..ee0116d368bf 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -42,6 +42,7 @@ Renderable::Renderable (BaseWindow* pWin)
 vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
 aPrintRangeOpt.maGroupHint = "PrintRange" ;
 aPrintRangeOpt.mbInternalOnly = true;
+
 m_aUIProperties[0].Value = setSubgroupControlOpt("printrange",
 IDEResId( RID_STR_PRINTDLG_PAGES ), OUString(), aPrintRangeOpt);
 
@@ -51,10 +52,17 @@ Renderable::Renderable (BaseWindow* pWin)
   IDEResId(RID_STR_PRINTDLG_PRINTPAGES),
   
IDEResId(RID_STR_PRINTDLG_PRINTEVENPAGES),
   
IDEResId(RID_STR_PRINTDLG_PRINTODDPAGES)};
-const Sequence 
aHelpIds{".HelpID:vcl:PrintDialog:PrintContent:ListBox"};
-m_aUIProperties[1].Value = setChoiceListControlOpt( "printpagesbox", 
OUString(),
+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"};
+const Sequence aWidgetIds{"rbAllPages",
+"rbRangePages",
+"rbEvenPages",
+"rbOddPages"};
+m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, 
OUString(),
aHelpIds, aPrintContentName,
-   aChoices, 0 );
+ 

[Libreoffice-commits] core.git: basctl/inc basctl/source compilerplugins/clang i18npool/inc package/inc package/source pyuno/source ucb/source

[Noel Grandin]

 basctl/inc/iderdll.hxx   |2 +-
 basctl/source/basicide/baside2.cxx   |4 ++--
 basctl/source/basicide/baside2.hxx   |6 +++---
 basctl/source/basicide/baside2b.cxx  |4 ++--
 basctl/source/basicide/basides1.cxx  |6 +++---
 basctl/source/basicide/basobj3.cxx   |   10 +-
 basctl/source/basicide/bastype2.cxx  |4 ++--
 basctl/source/basicide/iderdll.cxx   |2 +-
 basctl/source/basicide/iderdll2.hxx  |2 +-
 basctl/source/basicide/localizationmgr.cxx   |   10 +-
 basctl/source/basicide/moduldlg.cxx  |6 +++---
 basctl/source/basicide/moduldlg.hxx  |6 +++---
 basctl/source/inc/basidesh.hxx   |6 +++---
 basctl/source/inc/basobj.hxx |6 +++---
 basctl/source/inc/bastype2.hxx   |4 ++--
 basctl/source/inc/localizationmgr.hxx|8 
 compilerplugins/clang/constparams.cxx|4 
 i18npool/inc/breakiteratorImpl.hxx   |2 +-
 i18npool/inc/calendarImpl.hxx|2 +-
 i18npool/inc/characterclassificationImpl.hxx |4 ++--
 i18npool/inc/collatorImpl.hxx|2 +-
 package/inc/ZipFile.hxx  |4 ++--
 package/source/zipapi/ZipFile.cxx|4 ++--
 pyuno/source/module/pyuno.cxx|   18 +-
 pyuno/source/module/pyuno_impl.hxx   |6 +++---
 pyuno/source/module/pyuno_util.cxx   |2 +-
 ucb/source/ucp/webdav-neon/NeonSession.cxx   |4 ++--
 27 files changed, 71 insertions(+), 67 deletions(-)

New commits:
commit c394363c84064c041391627602665ea1fa74db60
Author: Noel Grandin 
Date:   Sun Jul 30 12:15:18 2017 +0200

loplugin:constparams in basctl

Change-Id: If6c2b980a2916c4ee8ac108fbb84b006a35f49c5
Reviewed-on: https://gerrit.libreoffice.org/40570
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/basctl/inc/iderdll.hxx b/basctl/inc/iderdll.hxx
index 83f92f839a3a..0087c915053c 100644
--- a/basctl/inc/iderdll.hxx
+++ b/basctl/inc/iderdll.hxx
@@ -30,7 +30,7 @@ void EnsureIde ();
 
 void ShellCreated (Shell* pShell);
 Shell* GetShell();
-void ShellDestroyed (Shell* pShell);
+void ShellDestroyed (Shell const * pShell);
 
 ExtraData* GetExtraData();
 
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index b3b3c44e23e2..300114d1185f 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -177,7 +177,7 @@ void lcl_ConvertTabsToSpaces( OUString& rLine )
 } // namespace
 
 ModulWindow::ModulWindow (ModulWindowLayout* pParent, ScriptDocument const& 
rDocument,
-  const OUString& aLibName, const OUString& aName, 
OUString& aModule)
+  const OUString& aLibName, const OUString& aName, 
OUString const & aModule)
 : BaseWindow(pParent, rDocument, aLibName, aName)
 , m_rLayout(*pParent)
 , m_nValid(ValidWindow)
@@ -587,7 +587,7 @@ void ModulWindow::ManageBreakPoints()
 }
 
 
-bool ModulWindow::BasicErrorHdl( StarBASIC * pBasic )
+bool ModulWindow::BasicErrorHdl( StarBASIC const * pBasic )
 {
 GetShell()->GetViewFrame()->ToTop();
 
diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 06539527200b..46d0d4353f59 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -157,7 +157,7 @@ public:
 voidChangeFontColor( Color aColor );
 voidUpdateSyntaxHighlighting ();
 
-boolGetProcedureName(OUString& rLine, OUString& rProcType, 
OUString& rProcName) const;
+boolGetProcedureName(OUString const & rLine, OUString& 
rProcType, OUString& rProcName) const;
 };
 
 
@@ -322,7 +322,7 @@ protected:
 virtual voidDoScroll( ScrollBar* pCurScrollBar ) override;
 
 public:
-ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, 
const OUString& aLibName, const OUString& aName, OUString& aModule );
+ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, 
const OUString& aLibName, const OUString& aName, OUString const & aModule );
 
 virtual ~ModulWindow() override;
 virtual voiddispose() override;
@@ -361,7 +361,7 @@ public:
 voidUpdateBreakPoint( const BreakPoint& rBrk );
 voidBasicAddWatch();
 
-boolBasicErrorHdl( StarBASIC* pBasic );
+boolBasicErrorHdl( StarBASIC const * pBasic );
 BasicDebugFlags BasicBreakHdl();
 voidAssertValidEditEngine();
 
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 631ab8a576e8..ef902a174294 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -122,7 

[Libreoffice-commits] core.git: basctl/inc basctl/source include/sfx2 include/svx sc/inc sc/source sd/inc sd/source sfx2/inc sfx2/source starmath/inc starmath/source svx/source sw/source

[Caolán McNamara]

 basctl/inc/basidesh.hrc|2 
 basctl/source/basicide/basidesh.src|4 
 include/sfx2/dispatch.hxx  |3 
 include/sfx2/objface.hxx   |7 -
 include/sfx2/toolbarids.hxx|   76 ++
 include/svx/fmresids.hrc   |8 -
 sc/inc/sc.hrc  |8 -
 sc/source/ui/app/scmod.cxx |2 
 sc/source/ui/drawfunc/chartsh.cxx  |2 
 sc/source/ui/drawfunc/drawsh.cxx   |2 
 sc/source/ui/drawfunc/drformsh.cxx |2 
 sc/source/ui/drawfunc/drtxtob.cxx  |2 
 sc/source/ui/drawfunc/graphsh.cxx  |2 
 sc/source/ui/drawfunc/mediash.cxx  |2 
 sc/source/ui/drawfunc/oleobjsh.cxx |2 
 sc/source/ui/view/cellsh.cxx   |2 
 sc/source/ui/view/formatsh.cxx |2 
 sc/source/ui/view/prevwsh.cxx  |2 
 sc/source/ui/view/tabvwsh.cxx  |2 
 sd/inc/helpids.h   |6 -
 sd/source/ui/app/strings.src   |   45 
 sd/source/ui/app/toolbox.src   |5 
 sd/source/ui/func/futext.cxx   |4 
 sd/source/ui/inc/ShellFactory.hxx  |5 
 sd/source/ui/inc/ToolBarManager.hxx|   28 ++---
 sd/source/ui/inc/cfgids.hxx|   14 --
 sd/source/ui/inc/strings.hrc   |   20 ---
 sd/source/ui/view/FormShellManager.cxx |6 -
 sd/source/ui/view/ToolBarManager.cxx   |   47 +
 sd/source/ui/view/ViewShellManager.cxx |2 
 sd/source/ui/view/drviews7.cxx |2 
 sd/source/ui/view/outlnvsh.cxx |4 
 sd/source/ui/view/presvish.cxx |8 -
 sd/source/ui/view/viewshel.cxx |   14 +-
 sfx2/inc/app.hrc   |3 
 sfx2/source/appl/workwin.cxx   |  170 -
 sfx2/source/appl/workwin.hrc   |   91 -
 sfx2/source/control/dispatch.cxx   |   24 ++--
 sfx2/source/control/objface.cxx|   24 ++--
 sfx2/source/inc/workwin.hxx|7 -
 sfx2/source/view/viewfrm.cxx   |4 
 starmath/inc/starmath.hrc  |2 
 starmath/source/view.cxx   |2 
 svx/source/form/fmshell.cxx|   12 +-
 svx/source/toolbars/extrusionbar.cxx   |2 
 svx/source/toolbars/fontworkbar.cxx|2 
 sw/source/ui/web/web.src   |   11 --
 sw/source/uibase/app/apphdl.cxx|2 
 sw/source/uibase/config/barcfg.cxx |4 
 sw/source/uibase/inc/barcfg.hxx|3 
 sw/source/uibase/inc/shells.hrc|   18 ---
 sw/source/uibase/inc/web.hrc   |5 
 sw/source/uibase/shells/annotsh.cxx|2 
 sw/source/uibase/shells/beziersh.cxx   |2 
 sw/source/uibase/shells/drawsh.cxx |2 
 sw/source/uibase/shells/drformsh.cxx   |2 
 sw/source/uibase/shells/drwtxtsh.cxx   |2 
 sw/source/uibase/shells/frmsh.cxx  |2 
 sw/source/uibase/shells/grfsh.cxx  |2 
 sw/source/uibase/shells/listsh.cxx |2 
 sw/source/uibase/shells/mediash.cxx|2 
 sw/source/uibase/shells/olesh.cxx  |2 
 sw/source/uibase/shells/tabsh.cxx  |2 
 sw/source/uibase/shells/textsh.cxx |2 
 sw/source/uibase/uiview/pview.cxx  |2 
 sw/source/uibase/uiview/srcview.cxx|2 
 sw/source/uibase/uiview/view.cxx   |6 -
 sw/source/uibase/uiview/view.hrc   |1 
 sw/source/uibase/uiview/view.src   |8 -
 sw/source/uibase/uiview/view0.cxx  |2 
 sw/source/uibase/web/wformsh.cxx   |2 
 sw/source/uibase/web/wfrmsh.cxx|2 
 sw/source/uibase/web/wgrfsh.cxx|2 
 sw/source/uibase/web/wlistsh.cxx   |2 
 sw/source/uibase/web/wolesh.cxx|2 
 sw/source/uibase/web/wtabsh.cxx|2 
 sw/source/uibase/web/wtextsh.cxx   |2 
 sw/source/uibase/web/wview.cxx |8 -
 78 files changed, 317 insertions(+), 478 deletions(-)

New commits:
commit 490e9dbade4f9d69cab4b1ec435944c9b4d2f6c2
Author: Caolán McNamara 
Date:   Tue May 30 16:50:18 2017 +0100

disambiguate dual use of toolbar ids

for toolbar title string resource and identifier (for config)

Change-Id: I2657c3cbb586a62d8075db7cb43cc064b2030f28
Reviewed-on: https://gerrit.libreoffice.org/38274
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 60a2f0fa903e..1c58557dddcc 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -22,8 +22,6 @@
 
 #include 
 
-#define RID_BASICIDE_OBJECTBAR  ( RID_BASICIDE_START +  0 )
-
 #define RID_STR_SEARCHALLMODULES( RID_BASICIDE_START +  1 )
 #define RID_STR_SEARCHFROMSTART ( RID_BASICIDE_START +  2 )
 #define RID_STR_NOMODULE( RID_BASICIDE_START +  3 )
diff --git a/basctl/source/basicide/basidesh.src 

[Libreoffice-commits] core.git: basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk include/sfx2 officecfg/registry

[Maxim Monastirsky]

 basctl/UIConfig_basicide.mk  |
1 
 basctl/inc/basidesh.hrc  |
1 
 basctl/source/basicide/baside2.cxx   |
2 
 basctl/source/basicide/baside2.hrc   |   
31 -
 basctl/source/basicide/baside2b.cxx  |
2 
 basctl/source/basicide/basides1.cxx  |   
37 +
 basctl/source/basicide/basidesh.src  |   
62 --
 basctl/source/basicide/bastype2.cxx  |
2 
 basctl/source/basicide/bastype3.cxx  |
2 
 basctl/source/basicide/bastypes.cxx  |   
54 
 basctl/source/basicide/macrodlg.cxx  |
2 
 basctl/source/basicide/moduldl2.cxx  |
2 
 basctl/uiconfig/basicide/popupmenu/tabbar.xml|   
22 +++
 include/sfx2/sfxcommands.h   |
6 
 officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu|   
25 
 officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu |
5 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |
3 
 17 files changed, 101 insertions(+), 158 deletions(-)

New commits:
commit f3ba0c5d4dfc44f72aa7d4809c062227649f098f
Author: Maxim Monastirsky 
Date:   Wed Feb 1 01:25:36 2017 +0200

Convert RID_POPUP_TABBAR to xml

Change-Id: Ic4587b8e244c52089692908fe0d10e363b5ed4fb

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index f79d9ce..97ced73 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,modules/BasicIDE))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/BasicIDE,\
basctl/uiconfig/basicide/popupmenu/dialog \
+   basctl/uiconfig/basicide/popupmenu/tabbar \
 ))
 
 $(eval $(call gb_UIConfig_add_menubarfiles,modules/BasicIDE,\
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 34f8d3a..fea24c0 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -23,7 +23,6 @@
 #include 
 
 #define RID_BASICIDE_OBJECTBAR  ( RID_BASICIDE_START +  0 )
-#define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
 
 #define RID_BMP_REMOVEWATCH ( RID_BASICIDE_START +  8 )
 #define RID_BMP_INSTALLATION( RID_BASICIDE_START + 20 )
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 675a0ea..aa6b7b0 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -25,7 +25,7 @@
 #include "docsignature.hxx"
 
 #include "helpid.hrc"
-#include "baside2.hrc"
+#include 
 
 #include 
 #include 
diff --git a/basctl/source/basicide/baside2.hrc 
b/basctl/source/basicide/baside2.hrc
deleted file mode 100644
index 038b35c..000
--- a/basctl/source/basicide/baside2.hrc
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-#ifndef BASCTL_BASIDE2_HRC
-#define BASCTL_BASIDE2_HRC
-
-#include 
-
-// Diese Dateien enthaelt nur die lokalen ID's.
-
-// RID_POPUP_TABBAR
-#define RID_INSERT  1
-
-#endif // BASCTL_BASIDE2_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 56e4280..72d656f 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -22,7 +22,7 @@
 #include 
 
 #include "helpid.hrc"
-#include "baside2.hrc"
+#include 
 
 #include "baside2.hxx"
 #include "brkdlg.hxx"
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 251c916..1fe82da 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -30,6 +30,7 @@
 
 #include 
 #include 

[Libreoffice-commits] core.git: basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk

[Caolán McNamara]

 basctl/UIConfig_basicide.mk|1 
 basctl/inc/basidesh.hrc|2 
 basctl/inc/helpid.hrc  |3 -
 basctl/source/basicide/baside2.hrc |7 ---
 basctl/source/basicide/baside2.hxx |2 
 basctl/source/basicide/baside2b.cxx|   56 -
 basctl/source/basicide/basidesh.src|   38 
 basctl/uiconfig/basicide/ui/breakpointmenus.ui |   42 ++
 8 files changed, 74 insertions(+), 77 deletions(-)

New commits:
commit 65f41e210f2ef3a77209f9ea1f89a17b4b3bffa9
Author: Caolán McNamara 
Date:   Mon Jan 30 15:31:45 2017 +

convert RID_POPUP_BRKPROPS menu to .ui

Change-Id: I2f55f4959249ac45de4a852089256a33e0f24d91

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 31b0334..f79d9ce 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
+   basctl/uiconfig/basicide/ui/breakpointmenus \
basctl/uiconfig/basicide/ui/defaultlanguage \
basctl/uiconfig/basicide/ui/deletelangdialog \
basctl/uiconfig/basicide/ui/dialogpage \
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 97d8ce1..34f8d3a 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -23,8 +23,6 @@
 #include 
 
 #define RID_BASICIDE_OBJECTBAR  ( RID_BASICIDE_START +  0 )
-#define RID_POPUP_BRKDLG( RID_BASICIDE_START + 10 )
-#define RID_POPUP_BRKPROPS  ( RID_BASICIDE_START + 11 )
 #define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
 
 #define RID_BMP_REMOVEWATCH ( RID_BASICIDE_START +  8 )
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 86e3d4f..3bafa97 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -21,9 +21,6 @@
 
 #define HID_BASICIDE_OBJECTCAT
"BASCTL_HID_BASICIDE_OBJECTCAT"
 
-#define HID_BASICIDE_BRKDLG   
"BASCTL_HID_BASICIDE_BRKDLG"
-#define HID_BASICIDE_ACTIV
"BASCTL_HID_BASICIDE_ACTIV"
-#define HID_BASICIDE_BRKPROPS 
"BASCTL_HID_BASICIDE_BRKPROPS"
 #define HID_BASICIDE_REMOVEWATCH  
"BASCTL_HID_BASICIDE_REMOVEWATCH"
 
 #define HID_BASICIDE_MODULWINDOW  
"BASCTL_HID_BASICIDE_MODULWINDOW"
diff --git a/basctl/source/basicide/baside2.hrc 
b/basctl/source/basicide/baside2.hrc
index e208d0f..038b35c 100644
--- a/basctl/source/basicide/baside2.hrc
+++ b/basctl/source/basicide/baside2.hrc
@@ -23,13 +23,6 @@
 
 // Diese Dateien enthaelt nur die lokalen ID's.
 
-// RID_POPUP_BRKPROPS
-#define RID_BRKPROPS1
-#define RID_ACTIV   2
-
-// RID_POPUP_BRKDLG
-#define RID_BRKDLG  1
-
 // RID_POPUP_TABBAR
 #define RID_INSERT  1
 
diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 35ffe34..4deb7db 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -168,6 +168,7 @@ private:
 sal_uInt16  nMarkerPos;
 BreakPointList  aBreakPointList;
 boolbErrorMarker;
+std::unique_ptr mpUIBuilder;
 
 virtual void DataChanged(DataChangedEvent const & rDCEvt) override;
 
@@ -184,6 +185,7 @@ protected:
 
 public:
 BreakPointWindow (vcl::Window* pParent, ModulWindow*);
+virtual voiddispose() override;
 
 voidSetMarkerPos( sal_uInt16 nLine, bool bErrorMarker = false 
);
 voidSetNoMarker ();
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 977d827..56e4280 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1456,40 +1456,36 @@ void BreakPointWindow::Command( const CommandEvent& 
rCEvt )
 BreakPoint* pBrk = rCEvt.IsMouseEvent() ? FindBreakPoint( aEventPos ) 
: nullptr;
 if ( pBrk )
 {
+if (!mpUIBuilder)
+mpUIBuilder.reset(new VclBuilder(nullptr, 
VclBuilderContainer::getUIRootDir(), "modules/BasicIDE/ui/breakpointmenus.ui", 
""));
+
 // test if break point is enabled...
-ScopedVclPtrInstance aBrkPropMenu( IDEResId( 
RID_POPUP_BRKPROPS ) );
-aBrkPropMenu->CheckItem( RID_ACTIV, pBrk->bEnabled );
-switch ( aBrkPropMenu->Execute( this, aPos ) )
+VclPtr xBrkPropMenu = 
mpUIBuilder->get_menu("breakmenu");
+xBrkPropMenu->CheckItem(xBrkPropMenu->GetItemId("active"), 
pBrk->bEnabled);
+OString sCommand = 
xBrkPropMenu->GetItemIdent(xBrkPropMenu->Execute(this, aPos));
+if (sCommand == "active")
  

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

[Caolán McNamara]

 basctl/inc/basidesh.hrc |5 +++--
 basctl/source/basicide/baside2b.cxx |5 -
 basctl/source/basicide/basidesh.src |   20 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit 74ead0785f7a08709cf6da6c24a936001b1a7d9c
Author: Caolán McNamara 
Date:   Wed Oct 12 11:51:06 2016 +0100

de-src solo image button

Change-Id: I82a613c8f371d8f585c53b2625e7dbed8ea0b703

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 2c6..7f21dc6c 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -27,7 +27,7 @@
 #define RID_POPUP_BRKPROPS  ( RID_BASICIDE_START + 11 )
 #define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
 
-#define RID_IMGBTN_REMOVEWATCH  ( RID_BASICIDE_START +  8 )
+#define RID_IMG_REMOVEWATCH ( RID_BASICIDE_START +  8 )
 #define RID_IMG_INSTALLATION( RID_BASICIDE_START + 20 )
 #define RID_IMG_DOCUMENT( RID_BASICIDE_START + 22 )
 #define RID_IMG_MODLIB  ( RID_BASICIDE_START + 24 )
@@ -103,7 +103,8 @@
 #define RID_STR_SHAREMACROS ( RID_BASICIDE_START + 75 )
 #define RID_STR_SHAREDIALOGS( RID_BASICIDE_START + 76 )
 #define RID_STR_SHAREMACROSDIALOGS  ( RID_BASICIDE_START + 77 )
-//free slots
+//free slot
+#define RID_STR_REMOVEWATCHTIP  ( RID_BASICIDE_START + 79 )
 #define RID_STR_QUERYREPLACEMACRO   ( RID_BASICIDE_START + 80 )
 #define RID_STR_FILENAME( RID_BASICIDE_START + 81 )
 #define RID_STR_APPENDLIBS  ( RID_BASICIDE_START + 82 )
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index ea89aac..d02782e 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1563,7 +1563,7 @@ WatchWindow::WatchWindow (Layout* pParent)
 : DockingWindow(pParent)
 , aWatchStr(IDEResId( RID_STR_REMOVEWATCH))
 , aXEdit(VclPtr::Create(this, WB_BORDER | WB_3DLOOK))
-, aRemoveWatchButton(VclPtr::Create(this, 
IDEResId(RID_IMGBTN_REMOVEWATCH)))
+, aRemoveWatchButton(VclPtr::Create(this, WB_SMALLSTYLE))
 , aTreeListBox(VclPtr::Create(this, WB_BORDER | 
WB_3DLOOK | WB_HASBUTTONS |
   WB_HASLINES | 
WB_HSCROLL | WB_TABSTOP |
   WB_HASLINESATROOT | 
WB_HASBUTTONSATROOT))
@@ -1584,6 +1584,9 @@ WatchWindow::WatchWindow (Layout* pParent)
 aRemoveWatchButton->Disable();
 aRemoveWatchButton->SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
 aRemoveWatchButton->SetPosPixel( Point( nTextLen + 
aXEdit->GetSizePixel().Width() + 4, 2 ) );
+aRemoveWatchButton->SetHelpId(HID_BASICIDE_REMOVEWATCH);
+aRemoveWatchButton->SetModeImage(Image(IDEResId(RID_IMG_REMOVEWATCH)));
+aRemoveWatchButton->SetQuickHelpText(IDEResId(RID_STR_REMOVEWATCHTIP));
 Size aSz( aRemoveWatchButton->GetModeImage().GetSizePixel() );
 aSz.Width() += 6;
 aSz.Height() += 6;
diff --git a/basctl/source/basicide/basidesh.src 
b/basctl/source/basicide/basidesh.src
index a9d08c3..8a21b54 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -285,16 +285,6 @@ String RID_STR_SEARCHALLMODULES
 {
 Text [ en-US ] = "Do you want to replace the text in all active modules?" ;
 };
-ImageButton RID_IMGBTN_REMOVEWATCH
-{
-HelpId = HID_BASICIDE_REMOVEWATCH ;
-SmallStyle = TRUE ;
-ButtonImage = Image
-{
-ImageBitmap = Bitmap { File = "baswatr.png" ; };
-};
-QuickHelpText [ en-US ] = "Remove Watch" ;
-};
 
 String RID_STR_REMOVEWATCH
 {
@@ -486,6 +476,16 @@ Image RID_IMG_DIALOG
 {
 ImageBitmap = Bitmap { File = "im30823.png"; };
 };
+Image RID_IMG_REMOVEWATCH
+{
+ImageBitmap = Bitmap { File = "baswatr.png" ; };
+};
+
+String RID_STR_REMOVEWATCHTIP
+{
+Text [ en-US ] = "Remove Watch" ;
+};
+
 String RID_STR_QUERYREPLACEMACRO
 {
 Text [ en-US ] = "Do you want to overwrite the XX macro?" ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 basctl/inc/basidesh.hrc |3 +--
 basctl/source/basicide/baside2b.cxx |   19 +++
 basctl/source/basicide/basidesh.src |7 ---
 basctl/source/basicide/bastype3.hxx |2 +-
 basctl/source/basicide/bastypes.cxx |   13 ++---
 5 files changed, 15 insertions(+), 29 deletions(-)

New commits:
commit 583ac140dcf6f11b21bc9c52516ba2bbcbd37a95
Author: Caolán McNamara 
Date:   Tue Oct 11 15:44:37 2016 +0100

de-src solo variable watch editbox

Change-Id: I9e69df546d5d6453fbd89b38d4865c9fd3088678

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 36b09dd..2c6 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -23,7 +23,6 @@
 #include 
 
 #define RID_BASICIDE_OBJECTBAR  ( RID_BASICIDE_START +  0 )
-#define RID_EDT_WATCHEDIT   ( RID_BASICIDE_START +  4 )
 #define RID_POPUP_BRKDLG( RID_BASICIDE_START + 10 )
 #define RID_POPUP_BRKPROPS  ( RID_BASICIDE_START + 11 )
 #define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
@@ -149,4 +148,4 @@
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index c83bc7b..ea89aac 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1559,16 +1559,19 @@ namespace
 const sal_uInt16 ITEM_ID_TYPE = 3;
 }
 
-WatchWindow::WatchWindow (Layout* pParent) :
-DockingWindow(pParent),
-aWatchStr( IDEResId( RID_STR_REMOVEWATCH ) ),
-aXEdit( VclPtr::Create(this, IDEResId( RID_EDT_WATCHEDIT )) 
),
-aRemoveWatchButton( VclPtr::Create(this, IDEResId( 
RID_IMGBTN_REMOVEWATCH )) ),
-aTreeListBox( VclPtr::Create(this, WB_BORDER | WB_3DLOOK 
| WB_HASBUTTONS | WB_HASLINES | WB_HSCROLL | WB_TABSTOP
-  | WB_HASLINESATROOT | WB_HASBUTTONSATROOT) ),
-aHeaderBar( VclPtr::Create( this, WB_BUTTONSTYLE | WB_BORDER ) )
+WatchWindow::WatchWindow (Layout* pParent)
+: DockingWindow(pParent)
+, aWatchStr(IDEResId( RID_STR_REMOVEWATCH))
+, aXEdit(VclPtr::Create(this, WB_BORDER | WB_3DLOOK))
+, aRemoveWatchButton(VclPtr::Create(this, 
IDEResId(RID_IMGBTN_REMOVEWATCH)))
+, aTreeListBox(VclPtr::Create(this, WB_BORDER | 
WB_3DLOOK | WB_HASBUTTONS |
+  WB_HASLINES | 
WB_HSCROLL | WB_TABSTOP |
+  WB_HASLINESATROOT | 
WB_HASBUTTONSATROOT))
+, aHeaderBar(VclPtr::Create(this, WB_BUTTONSTYLE | WB_BORDER))
 {
 aXEdit->SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString());
+aXEdit->SetHelpId(HID_BASICIDE_WATCHWINDOW_EDIT);
+aXEdit->SetSizePixel(aXEdit->LogicToPixel(Size(80, 12), 
MapUnit::MapAppFont));
 aTreeListBox->SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString());
 
 long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3;
diff --git a/basctl/source/basicide/basidesh.src 
b/basctl/source/basicide/basidesh.src
index 08a6f72..a9d08c3 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -285,13 +285,6 @@ String RID_STR_SEARCHALLMODULES
 {
 Text [ en-US ] = "Do you want to replace the text in all active modules?" ;
 };
-Edit RID_EDT_WATCHEDIT
-{
-HelpId = HID_BASICIDE_WATCHWINDOW_EDIT ;
-Border = TRUE ;
-SvLook = TRUE ;
-Size = MAP_APPFONT ( 80 , 12 ) ;
-};
 ImageButton RID_IMGBTN_REMOVEWATCH
 {
 HelpId = HID_BASICIDE_REMOVEWATCH ;
diff --git a/basctl/source/basicide/bastype3.hxx 
b/basctl/source/basicide/bastype3.hxx
index 5c88925..580da6a 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -39,7 +39,7 @@ protected:
 DECL_LINK( ImplLoseFocusHdl, Control&, void );
 
 public:
-ExtendedEdit( vcl::Window* pParent, IDEResId nRes );
+ExtendedEdit(vcl::Window* pParent, WinBits nStyle);
 
 voidSetAccHdl( const Link& rLink ) 
{ aAccHdl = rLink; }
 Accelerator&GetAccelerator()  
{ return aAcc; }
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 9bff85d..5b0f9de 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -414,12 +414,8 @@ void DockingWindow::DockThis ()
 }
 }
 
-
-// ExtendedEdit
-
-
-ExtendedEdit::ExtendedEdit( vcl::Window* pParent, IDEResId nRes ) :
-Edit( pParent, nRes )
+ExtendedEdit::ExtendedEdit(vcl::Window* pParent, WinBits nStyle)
+: Edit(pParent, nStyle)
 {
 aAcc.SetSelectHdl( LINK( this, ExtendedEdit, EditAccHdl ) );
 Control::SetGetFocusHdl( LINK( this, ExtendedEdit, ImplGetFocusHdl ) );
@@ -432,21 +428,16 @@ IMPL_LINK_NOARG(ExtendedEdit, ImplGetFocusHdl, Control&, 
void)
 

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

[Muhammet Kara]

 basctl/inc/basidesh.hrc|   14 +-
 basctl/source/basicide/basicprint.src  |   17 ++---
 basctl/source/basicide/basicrenderable.cxx |   11 +++
 3 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit 3e79c2f8c274c906d8ac259b4984b9637498e87b
Author: Muhammet Kara 
Date:   Thu Jul 28 17:50:07 2016 +0300

tdf#91665 l10n: replace string lists - by separate strings

Convert the stingarray to resource strings.

Change-Id: Iae9c52c21fd004c052fa78d959dfa92ad1d16a7d
Reviewed-on: https://gerrit.libreoffice.org/27641
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 22288cb..36b09dd 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -27,7 +27,6 @@
 #define RID_POPUP_BRKDLG( RID_BASICIDE_START + 10 )
 #define RID_POPUP_BRKPROPS  ( RID_BASICIDE_START + 11 )
 #define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
-#define RID_PRINTDLG_STRLIST( RID_BASICIDE_START + 78 )
 
 #define RID_IMGBTN_REMOVEWATCH  ( RID_BASICIDE_START +  8 )
 #define RID_IMG_INSTALLATION( RID_BASICIDE_START + 20 )
@@ -90,14 +89,14 @@
 #define RID_STR_NEWDLG  ( RID_BASICIDE_START + 59 )
 #define RID_STR_LIBNAMETOLONG   ( RID_BASICIDE_START + 60 )
 #define RID_STR_ERRORCHOOSEMACRO( RID_BASICIDE_START + 61 )
-// free
+//free slot
 #define RID_STR_LIBISREADONLY   ( RID_BASICIDE_START + 63 )
 #define RID_STR_REPLACELIB  ( RID_BASICIDE_START + 64 )
 // free
 #define RID_STR_IMPORTNOTPOSSIBLE   ( RID_BASICIDE_START + 67 )
 #define RID_STR_NOIMPORT( RID_BASICIDE_START + 68 )
 #define RID_STR_ENTERPASSWORD   ( RID_BASICIDE_START + 69 )
-// free
+
 #define RID_STR_NEWMETH ( RID_BASICIDE_START + 71 )
 #define RID_STR_USERMACROS  ( RID_BASICIDE_START + 72 )
 #define RID_STR_USERDIALOGS ( RID_BASICIDE_START + 73 )
@@ -105,7 +104,7 @@
 #define RID_STR_SHAREMACROS ( RID_BASICIDE_START + 75 )
 #define RID_STR_SHAREDIALOGS( RID_BASICIDE_START + 76 )
 #define RID_STR_SHAREMACROSDIALOGS  ( RID_BASICIDE_START + 77 )
-// free
+//free slots
 #define RID_STR_QUERYREPLACEMACRO   ( RID_BASICIDE_START + 80 )
 #define RID_STR_FILENAME( RID_BASICIDE_START + 81 )
 #define RID_STR_APPENDLIBS  ( RID_BASICIDE_START + 82 )
@@ -142,7 +141,12 @@
 #define RID_STR_USERFORMS   ( RID_BASICIDE_START + 119 )
 #define RID_STR_NORMAL_MODULES  ( RID_BASICIDE_START + 120 )
 #define RID_STR_CLASS_MODULES   ( RID_BASICIDE_START + 121 )
+//free slots
+
+#define RID_STR_PRINTDLG_RANGE  ( RID_BASICIDE_START + 130 )
+#define RID_STR_PRINTDLG_ALLPAGES   ( RID_BASICIDE_START + 131 )
+#define RID_STR_PRINTDLG_PAGES  ( RID_BASICIDE_START + 132 )
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/basctl/source/basicide/basicprint.src 
b/basctl/source/basicide/basicprint.src
index 1e2ba17..7eb01d2 100644
--- a/basctl/source/basicide/basicprint.src
+++ b/basctl/source/basicide/basicprint.src
@@ -19,14 +19,17 @@
 
 #include 
 
-StringArray RID_PRINTDLG_STRLIST
+String RID_STR_PRINTDLG_RANGE
 {
-ItemList [en-US] =
-{
-< "Print range"; >;
-< "All ~Pages"; >;
-< "Pa~ges"; >;
-};
+Text [ en-US ] = "Print range";
+};
+String RID_STR_PRINTDLG_ALLPAGES
+{
+Text [ en-US ] = "All ~Pages";
+};
+String RID_STR_PRINTDLG_PAGES
+{
+Text [ en-US ] = "Pa~ges";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index 86afd20..6983244 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -37,11 +37,6 @@ Renderable::Renderable (BaseWindow* pWin)
 : cppu::WeakComponentImplHelper< css::view::XRenderable >( maMutex )
 , mpWindow( pWin )
 {
-ResStringArray aStrings( IDEResId( RID_PRINTDLG_STRLIST )  );
-DBG_ASSERT( aStrings.Count() >= 3, "resource incomplete" );
-if( aStrings.Count() < 3 ) // bad resource ?
-return;
-
 m_aUIProperties.resize( 3 );
 
 // show Subgroup for print range
@@ -49,16 +44,16 @@ Renderable::Renderable (BaseWindow* pWin)
 aPrintRangeOpt.maGroupHint = "PrintRange" ;
 aPrintRangeOpt.mbInternalOnly = true;
 m_aUIProperties[0].Value = setSubgroupControlOpt("printrange",
-OUString(aStrings.GetString(0)), OUString(), aPrintRangeOpt);
+IDE_RESSTR( RID_STR_PRINTDLG_RANGE ), OUString(), aPrintRangeOpt);
 
 // create a choice for the range to print
 OUString aPrintContentName( 

[Libreoffice-commits] core.git: basctl/inc basctl/source basegfx/inc basegfx/source basic/inc basic/source canvas/source cppcanvas/qa editeng/inc editeng/qa editeng/source filter/source forms/inc form

[Caolán McNamara]

 basctl/inc/pch/precompiled_basctl.hxx   |2 -
 basctl/source/basicide/basdoc.hxx   |2 -
 basctl/source/basicide/basobj2.cxx  |4 +--
 basctl/source/basicide/documentenumeration.hxx  |5 +---
 basctl/source/basicide/iderdll2.hxx |4 +--
 basctl/source/basicide/layout.cxx   |2 -
 basctl/source/basicide/scriptdocument.cxx   |2 -
 basctl/source/dlged/propbrw.cxx |4 +--
 basctl/source/inc/baside3.hxx   |6 ++---
 basctl/source/inc/dlged.hxx |   10 
 basctl/source/inc/docsignature.hxx  |4 +--
 basegfx/inc/pch/precompiled_basegfx.hxx |1 
 basegfx/source/polygon/b2dpolygon.cxx   |   12 +-
 basic/inc/pch/precompiled_sb.hxx|1 
 basic/source/classes/sbxmod.cxx |9 +++
 basic/source/comp/dim.cxx   |6 ++---
 basic/source/comp/io.cxx|   14 ++--
 basic/source/comp/loops.cxx |4 +--
 basic/source/comp/sbcomp.cxx|4 +--
 basic/source/runtime/dllmgr.hxx |8 ++
 basic/source/runtime/inputbox.cxx   |2 -
 basic/source/runtime/methods.cxx|4 ---
 basic/source/sbx/sbxdate.cxx|6 ++---
 basic/source/uno/namecont.cxx   |8 +++---
 basic/source/uno/scriptcont.cxx |6 ++---
 canvas/source/directx/dx_9rm.cxx|1 
 cppcanvas/qa/unit/test.cxx  |1 
 editeng/inc/pch/precompiled_editeng.hxx |2 -
 editeng/qa/unit/core-test.cxx   |   10 
 editeng/source/editeng/editdoc.hxx  |6 ++---
 editeng/source/editeng/editobj2.hxx |4 +--
 editeng/source/editeng/impedit2.cxx |6 +
 editeng/source/misc/splwrap.cxx |8 +++---
 editeng/source/uno/unotext.cxx  |4 +--
 filter/source/flash/swfexporter.cxx |4 +--
 filter/source/graphicfilter/eps/eps.cxx |4 +--
 filter/source/graphicfilter/icgm/cgm.cxx|6 ++---
 filter/source/msfilter/escherex.cxx |7 ++
 filter/source/msfilter/svdfppt.cxx  |   11 -
 filter/source/msfilter/util.cxx |4 +--
 filter/source/pdf/pdfexport.cxx |8 +++---
 filter/source/pdf/pdffilter.cxx |4 +--
 filter/source/svg/svgexport.cxx |4 +--
 filter/source/svg/svgfilter.cxx |4 +--
 filter/source/svg/svgimport.cxx |4 +--
 filter/source/svg/svgwriter.cxx |4 +--
 filter/source/textfilterdetect/filterdetect.cxx |4 +--
 filter/source/xmlfilterdetect/filterdetect.cxx  |4 +--
 filter/source/xsltfilter/LibXSLTTransformer.cxx |4 +--
 filter/source/xsltfilter/OleHandler.cxx |6 ++---
 forms/inc/pch/precompiled_frm.hxx   |1 
 forms/source/component/EventThread.cxx  |4 +--
 forms/source/component/ImageControl.cxx |4 +--
 forms/source/misc/InterfaceContainer.cxx|8 +++---
 forms/source/richtext/richtextengine.cxx|4 +--
 forms/source/xforms/submission.cxx  |7 +-
 forms/source/xforms/submission/serialization_app_xml.cxx|2 -
 forms/source/xforms/submission/submission_get.cxx   |4 +--
 framework/inc/dispatch/closedispatcher.hxx  |4 +--
 framework/inc/pch/precompiled_fwk.hxx   |2 -
 framework/inc/pch/precompiled_fwl.hxx   |1 
 framework/source/uiconfiguration/imagemanagerimpl.cxx   |6 ++---
 framework/source/uielement/controlmenucontroller.cxx|6 ++---
 framework/source/uielement/fontsizemenucontroller.cxx   |4 +--
 framework/source/uielement/imagebuttontoolbarcontroller.cxx |4 +--
 framework/source/uielement/newmenucontroller.cxx|4 +--
 hwpfilter/source/hiodev.h   |4 +--
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx |4 +--
 i18nutil/source/utility/unicode.cxx   

[Libreoffice-commits] core.git: basctl/inc basctl/source canvas/source chart2/source connectivity/source dbaccess/source extensions/source forms/inc forms/source include/o3tl o3tl/README reportdesign/

[Thorsten Behrens]

 basctl/inc/pch/precompiled_basctl.hxx |2 
 basctl/source/dlged/dlgedobj.cxx  |2 
 canvas/source/factory/cf_service.cxx  |2 
 chart2/source/controller/accessibility/AccessibleBase.cxx |2 
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx |2 
 chart2/source/inc/ContainerHelper.hxx |2 
 chart2/source/model/template/ChartTypeManager.cxx |2 
 connectivity/source/commontools/TSortIndex.cxx|2 
 connectivity/source/commontools/TTableHelper.cxx  |2 
 dbaccess/source/core/dataaccess/documentevents.cxx|2 
 dbaccess/source/ui/browser/genericcontroller.cxx  |2 
 dbaccess/source/ui/dlg/DbAdminImpl.cxx|2 
 extensions/source/propctrlr/eformshelper.cxx  |2 
 extensions/source/propctrlr/eventhandler.cxx  |2 
 extensions/source/propctrlr/genericpropertyhandler.cxx|2 
 forms/inc/pch/precompiled_frm.hxx |2 
 forms/source/xforms/convert.cxx   |2 
 forms/source/xforms/datatyperepository.cxx|2 
 include/o3tl/compat_functional.hxx|   65 
--
 include/o3tl/functional.hxx   |   65 
++
 o3tl/README   |7 -
 reportdesign/source/ui/inspection/GeometryHandler.cxx |2 
 sd/inc/pch/precompiled_sd.hxx |2 
 sd/source/ui/tools/PropertySet.cxx|1 
 svx/inc/pch/precompiled_svxcore.hxx   |2 
 svx/source/form/formcontroller.cxx|2 
 26 files changed, 91 insertions(+), 91 deletions(-)

New commits:
commit ad1f0d1f1a195a00cf2ec2848745fdc6186bfbb1
Author: Thorsten Behrens thorsten.behr...@cib.de
Date:   Mon Aug 17 14:40:17 2015 +0200

o3tl: rename compat_functional header

After the cleanup, the stuff there really stands on its own (and the
remaining usage of select1st/2nd is more descriptive than lambdas).

Change-Id: I0aba131d5dc550189f8130d167dc94167e404540
Reviewed-on: https://gerrit.libreoffice.org/17806
Reviewed-by: Thorsten Behrens thorsten.behr...@cib.de
Tested-by: Thorsten Behrens thorsten.behr...@cib.de

diff --git a/basctl/inc/pch/precompiled_basctl.hxx 
b/basctl/inc/pch/precompiled_basctl.hxx
index ec4fc38..0ae4276 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -112,7 +112,7 @@
 #include framework/documentundoguard.hxx
 #include initializer_list
 #include map
-#include o3tl/compat_functional.hxx
+#include o3tl/functional.hxx
 #include officecfg/Office/Common.hxx
 #include osl/diagnose.h
 #include osl/file.hxx
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index f43879c..9e4ab9b 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -39,7 +39,7 @@
 #include com/sun/star/lang/WrappedTargetRuntimeException.hpp
 #include com/sun/star/script/XScriptEventsSupplier.hpp
 #include com/sun/star/table/CellAddress.hpp
-#include o3tl/compat_functional.hxx
+#include o3tl/functional.hxx
 #include unotools/sharedunocomponent.hxx
 #include vcl/svapp.hxx
 
diff --git a/canvas/source/factory/cf_service.cxx 
b/canvas/source/factory/cf_service.cxx
index 9d1d2b2..3a8130d 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -38,7 +38,7 @@
 #include cppuhelper/supportsservice.hxx
 #include osl/mutex.hxx
 #include osl/process.h
-#include o3tl/compat_functional.hxx
+#include o3tl/functional.hxx
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx 
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index d092640..c14f9da 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -48,7 +48,7 @@
 #include vcl/window.hxx
 #include vcl/graph.hxx
 #include vcl/settings.hxx
-#include o3tl/compat_functional.hxx
+#include o3tl/functional.hxx
 
 #include algorithm
 
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index d89abcc..d356bea 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -66,7 +66,7 @@
 #include vector
 #include algorithm
 #include functional
-#include o3tl/compat_functional.hxx
+#include o3tl/functional.hxx
 
 using namespace 

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

[Takeshi Abe]

 basctl/inc/pch/precompiled_basctl.hxx   |2 +-
 basctl/source/basicide/basicrenderable.cxx  |4 ++--
 basctl/source/basicide/basicrenderable.hxx  |4 ++--
 basctl/source/basicide/baside2b.cxx |4 ++--
 basctl/source/basicide/basidesh.cxx |3 ++-
 basctl/source/basicide/doceventnotifier.cxx |6 +++---
 basctl/source/basicide/moduldl2.cxx |5 +++--
 basctl/source/inc/dlgedclip.hxx |4 ++--
 basctl/source/inc/dlgedlist.hxx |6 +++---
 9 files changed, 20 insertions(+), 18 deletions(-)

New commits:
commit c73e3bb925a2c08c9aea0e8e7a7e3502b68c044e
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Jul 2 15:29:29 2015 +0900

tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants, in basctl.

Change-Id: I52da577a6f6298eb89b0cc8c8ff243ecd341e9b3
Reviewed-on: https://gerrit.libreoffice.org/16718
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/basctl/inc/pch/precompiled_basctl.hxx 
b/basctl/inc/pch/precompiled_basctl.hxx
index f81441cd..ec4fc38 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -103,7 +103,7 @@
 #include comphelper/types.hxx
 #include config_options.h
 #include cppuhelper/basemutex.hxx
-#include cppuhelper/compbase1.hxx
+#include cppuhelper/compbase.hxx
 #include cppuhelper/component_context.hxx
 #include cppuhelper/factory.hxx
 #include cppuhelper/supportsservice.hxx
diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index 7281417..61b7d2f 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -24,7 +24,7 @@
 #include toolkit/awt/vclxdevice.hxx
 #include tools/multisel.hxx
 #include tools/resary.hxx
-
+#include cppuhelper/compbase.hxx
 #include comphelper/propertysequence.hxx
 
 namespace basctl
@@ -34,7 +34,7 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 
 Renderable::Renderable (BaseWindow* pWin)
-: cppu::WeakComponentImplHelper1 com::sun::star::view::XRenderable ( maMutex 
)
+: cppu::WeakComponentImplHelper com::sun::star::view::XRenderable ( maMutex )
 , mpWindow( pWin )
 {
 ResStringArray aStrings( IDEResId( RID_PRINTDLG_STRLIST )  );
diff --git a/basctl/source/basicide/basicrenderable.hxx 
b/basctl/source/basicide/basicrenderable.hxx
index e48ffec..dba38c8 100644
--- a/basctl/source/basicide/basicrenderable.hxx
+++ b/basctl/source/basicide/basicrenderable.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX
 
 #include com/sun/star/view/XRenderable.hpp
-#include cppuhelper/compbase1.hxx
+#include cppuhelper/compbase.hxx
 
 #include vcl/print.hxx
 
@@ -30,7 +30,7 @@ namespace basctl
 class BaseWindow;
 
 class Renderable :
-public cppu::WeakComponentImplHelper1 com::sun::star::view::XRenderable ,
+public cppu::WeakComponentImplHelper com::sun::star::view::XRenderable ,
 public vcl::PrinterOptionsHelper
 {
 VclPtrBaseWindow  mpWindow;
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index c54043d..c218398 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -43,7 +43,7 @@
 #include svtools/treelistentry.hxx
 #include vcl/taskpanelist.hxx
 #include vcl/help.hxx
-
+#include cppuhelper/implbase.hxx
 #include vector
 #include com/sun/star/reflection/theCoreReflection.hpp
 
@@ -176,7 +176,7 @@ void lcl_SeparateNameAndIndex( const OUString rVName, 
OUString rVar, OUString
 
 
 class EditorWindow::ChangesListener:
-public cppu::WeakImplHelper1 beans::XPropertiesChangeListener 
+public cppu::WeakImplHelper beans::XPropertiesChangeListener 
 {
 public:
 explicit ChangesListener(EditorWindow  editor): editor_(editor) {}
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index 7958911..742e48c 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -55,6 +55,7 @@
 #include sfx2/viewfac.hxx
 #include vcl/msgbox.hxx
 #include vcl/settings.hxx
+#include cppuhelper/implbase.hxx
 
 namespace basctl
 {
@@ -62,7 +63,7 @@ namespace basctl
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper1 container::XContainerListener  
ContainerListenerBASE;
+typedef ::cppu::WeakImplHelper container::XContainerListener  
ContainerListenerBASE;
 
 class ContainerListenerImpl : public ContainerListenerBASE
 {
diff --git a/basctl/source/basicide/doceventnotifier.cxx 
b/basctl/source/basicide/doceventnotifier.cxx
index 03ba5c1..a37a028 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -29,7 +29,7 @@
 #include comphelper/processfactory.hxx
 
 
-#include cppuhelper/compbase1.hxx
+#include cppuhelper/compbase.hxx
 #include 

[Libreoffice-commits] core.git: basctl/inc basctl/source include/sfx2

[Jan Holesovsky]

 basctl/inc/basidesh.hrc |1 +
 basctl/source/basicide/basidesh.cxx |   10 +-
 basctl/source/basicide/basidesh.src |4 
 include/sfx2/viewfrm.hxx|2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 7aa79223d73a97c6530894a8feea51e9820b14cb
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu May 22 17:29:56 2014 +0200

bnc#467278: Introduce a warning that changes to VBA macros cannot be saved.

As an InfoBar, so hopefully not annoying...

Change-Id: I5d4e79273edc03829fdab2d6d5a291576c954e4b

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 4fee05a..d6cf84d 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -61,6 +61,7 @@
 #define RID_STR_OPEN( RID_BASICIDE_START + 20 )
 #define RID_STR_SAVE( RID_BASICIDE_START + 21 )
 #define RID_STR_RUNTIMEERROR( RID_BASICIDE_START + 22 )
+#define RID_STR_CANNOTSAVEVBA   ( RID_BASICIDE_START + 23 )
 #define RID_STR_STDDIALOGNAME   ( RID_BASICIDE_START + 24 )
 
 #define RID_STR_STDMODULENAME   ( RID_BASICIDE_START + 27 )
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index cad57f7..f66f8ca 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -37,6 +37,7 @@
 #include sfx2/app.hxx
 #include sfx2/dinfdlg.hxx
 #include sfx2/dispatch.hxx
+#include sfx2/infobar.hxx
 #include sfx2/minfitem.hxx
 #include sfx2/objface.hxx
 #include svl/aeitem.hxx
@@ -140,8 +141,8 @@ SFX_IMPL_INTERFACE(basctl_Shell, SfxViewShell, 
IDEResId(RID_STR_IDENAME))
 void basctl_Shell::InitInterface_Impl()
 {
 GetStaticInterface()-RegisterChildWindow(SID_SEARCH_DLG);
-
 GetStaticInterface()-RegisterChildWindow(SID_SHOW_PROPERTYBROWSER, false, 
BASICIDE_UI_FEATURE_SHOW_BROWSER);
+
GetStaticInterface()-RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
 
 GetStaticInterface()-RegisterPopupMenu(IDEResId(RID_POPUP_DLGED));
 }
@@ -253,7 +254,14 @@ Shell::~Shell()
 void Shell::onDocumentCreated( const ScriptDocument /*_rDocument*/ )
 {
 if (pCurWin)
+{
 pCurWin-OnNewDocument();
+
+// for VBA documents, show a warning that we can save them only in ODF
+if (pCurWin-GetDocument().isInVBAMode())
+GetViewFrame()-AppendInfoBar(vba_save, 
IDE_RESSTR(RID_STR_CANNOTSAVEVBA));
+}
+
 UpdateWindows();
 }
 
diff --git a/basctl/source/basicide/basidesh.src 
b/basctl/source/basicide/basidesh.src
index 70d6423..3875f5b 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -216,6 +216,10 @@ String RID_STR_CANNOTCLOSE
 {
 Text [ en-US ] = The window cannot be closed while BASIC is running. ;
 };
+String RID_STR_CANNOTSAVEVBA
+{
+Text [ en-US ] = You are editing a VBA macro. Changes can be saved only 
in OpenDocument Format. ;
+};
 String RID_STR_REPLACESTDLIB
 {
 Text [ en-US ] = The default library cannot be replaced. ;
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 09ec9b5..af55515 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -194,7 +194,7 @@ public:
 The buttons will be added from Right to Left at the right of the info 
bar. The parent, size
 and position of each button will be changed: only the width will 
remain unchanged.
   */
-voidAppendInfoBar( const OUString sId, const 
OUString sMessage, std::vector PushButton*  aButtons );
+voidAppendInfoBar( const OUString sId, const 
OUString sMessage, std::vector PushButton*  aButtons = std::vector 
PushButton* () );
 voidRemoveInfoBar( const OUString sId );
 
 SAL_DLLPRIVATE void SetDowning_Impl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk extras/source

[Caolán McNamara]

 basctl/UIConfig_basicide.mk|1 
 basctl/inc/basidesh.hrc|1 
 basctl/inc/helpid.hrc  |1 
 basctl/source/basicide/moduldl2.cxx|   20 ++
 basctl/source/basicide/moduldlg.cxx|   25 +--
 basctl/source/basicide/moduldlg.hxx|   39 ++---
 basctl/source/basicide/moduldlg.src|   56 ---
 basctl/uiconfig/basicide/ui/importlibdialog.ui |  195 +
 extras/source/glade/libreoffice-catalog.xml.in |3 
 9 files changed, 244 insertions(+), 97 deletions(-)

New commits:
commit 6fd7f5b1c931051b9fff31436955c1c6af00d135
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Jan 3 14:38:01 2014 +

convert import library dialog to .ui

Change-Id: Iaedcbeb5618ece65692a9688ccb5c13aad1e6626

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 0a0263d..21e52ee 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
basctl/uiconfig/basicide/ui/gotolinedialog \
basctl/uiconfig/basicide/ui/exportdialog \
+   basctl/uiconfig/basicide/ui/importlibdialog \
basctl/uiconfig/basicide/ui/managebreakpoints \
basctl/uiconfig/basicide/ui/newlibdialog \
basctl/uiconfig/basicide/ui/organizedialog \
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index fbf22d4..6fdd05e 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -33,7 +33,6 @@
 #define RID_TP_MODULS   ( RID_BASICIDE_START + 37 )
 #define RID_TP_LIBS ( RID_BASICIDE_START + 38 )
 #define RID_TP_DLGS ( RID_BASICIDE_START + 39 )
-#define RID_DLG_LIBS( RID_BASICIDE_START + 40 )
 #define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 )
 #define RID_PRINTDLG_STRLIST( RID_BASICIDE_START + 78 )
 
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 4d6c92b..75aca8f 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -26,7 +26,6 @@
 
 #define HID_BASICIDE_MODULES_TREE 
BASCTL_HID_BASICIDE_MODULES_TREE
 #define HID_BASICIDE_LIBS_TREE
BASCTL_HID_BASICIDE_LIBS_TREE
-#define HID_BASICIDE_LIBSDLG_TREE 
BASCTL_HID_BASICIDE_LIBSDLG_TREE
 #define HID_BASICIDE_OBJECTCAT
BASCTL_HID_BASICIDE_OBJECTCAT
 
 #define HID_BASICIDE_OBJCAT_SHOW  
BASCTL_HID_BASICIDE_OBJCAT_SHOW
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 9a4c1a1..4edc506 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -173,6 +173,26 @@ CheckBox::CheckBox( Window* pParent, const ResId rResId )
 Init();
 }
 
+CheckBox::CheckBox(Window* pParent, WinBits nStyle)
+: SvTabListBox(pParent, nStyle)
+, eMode(ObjectMode::Module)
+, m_aDocument(ScriptDocument::getApplicationScriptDocument())
+{
+long aTabs_[] = { 1, 12 };  // TabPos needs at least one...
+// 12 because of the CheckBox
+SetTabs( aTabs_ );
+Init();
+}
+
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCheckBox(Window *pParent, 
VclBuilder::stringmap rMap)
+{
+WinBits nWinBits = WB_TABSTOP;
+OString sBorder = VclBuilder::extractCustomProperty(rMap);
+if (!sBorder.isEmpty())
+   nWinBits |= WB_BORDER;
+return new CheckBox(pParent, nWinBits);
+}
+
 //
 
 CheckBox::~CheckBox()
diff --git a/basctl/source/basicide/moduldlg.cxx 
b/basctl/source/basicide/moduldlg.cxx
index c6808c5..48bf93e 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -909,31 +909,22 @@ void ObjectPage::EndTabDialog( sal_uInt16 nRet )
 pTabDlg-EndDialog( nRet );
 }
 
-
 LibDialog::LibDialog( Window* pParent )
-: ModalDialog( pParent, IDEResId( RID_DLG_LIBS ) ),
-aOKButton(  this, IDEResId( RID_PB_OK ) ),
-aCancelButton(  this, IDEResId( RID_PB_CANCEL ) ),
-aStorageName(   this, IDEResId( RID_FT_STORAGENAME ) ),
-aLibBox(this, IDEResId( RID_CTRL_LIBS ) ),
-aFixedLine( this, IDEResId( RID_FL_OPTIONS ) ),
-aReferenceBox(  this, IDEResId( RID_CB_REF ) ),
-aReplaceBox(this, IDEResId( RID_CB_REPL ) )
-{
-SetText( IDE_RESSTR(RID_STR_APPENDLIBS) );
-FreeResource();
-}
-
-
-LibDialog::~LibDialog()
+: ModalDialog(pParent, ImportLibDialog, 
modules/BasicIDE/ui/importlibdialog.ui)
 {
+get(m_pStorageFrame, storageframe);
+get(m_pReferenceBox, ref);
+get(m_pReplaceBox, replace);
+get(m_pLibBox, entries);
+m_pLibBox-set_height_request(m_pLibBox-GetTextHeight() * 8);
+

[Libreoffice-commits] core.git: basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk

[Caolán McNamara]

 basctl/UIConfig_basicide.mk   |1 
 basctl/inc/basidesh.hrc   |2 
 basctl/source/basicide/basidesh.src   |5 -
 basctl/source/basicide/moduldl2.cxx   |   23 ++---
 basctl/source/basicide/moduldlg.hxx   |   10 --
 basctl/source/basicide/moduldlg.src   |   37 
 basctl/uiconfig/basicide/ui/gotolinedialog.ui |  108 ++
 7 files changed, 122 insertions(+), 64 deletions(-)

New commits:
commit ec6050497acb445d168f835dfc745ceace072ab9
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Dec 31 20:28:16 2013 +

convert goto line dialog to .ui

Change-Id: I4c4ec4f2169d001e6f09c9c7bb06a4b0b327a2f8

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 6f84bb4..053f77b 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
+   basctl/uiconfig/basicide/ui/gotolinedialog \
basctl/uiconfig/basicide/ui/organizedialog \
 ))
 
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index b064dcb..b5077b8 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -153,10 +153,8 @@
 #define RID_STR_NORMAL_MODULES  ( RID_BASICIDE_START + 120 )
 #define RID_STR_CLASS_MODULES   ( RID_BASICIDE_START + 121 )
 
-#define RID_DLG_GOTOLINE( RID_BASICIDE_START + 122 )
 #define RID_FT_LINE ( RID_BASICIDE_START + 123 )
 #define RID_ED_LINE ( RID_BASICIDE_START + 124 )
-#define RID_STR_GETLINE ( RID_BASICIDE_START + 125 )
 
 #endif  // _SVX_NOIDERESIDS
 
diff --git a/basctl/source/basicide/basidesh.src 
b/basctl/source/basicide/basidesh.src
index 6876130..b52526e 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -601,11 +601,6 @@ String RID_STR_DLGIMP_MISMATCH_TEXT
 Text [ en-US ] = The dialog to be imported supports other languages than 
the target library.\n\nAdd these languages to the library to keep additional 
language resources provided by the dialog or omit them to stay with the current 
library languages.\n\nNote: For languages not supported by the dialog the 
resources of the dialog's default language will be used.\n  ;
 };
 
-String RID_STR_GETLINE
-{
-Text [ en-US ] = Goto Line;
-};
-
 #define MN_EDIT   20
 #define MN_VIEW 21
 #define MN_EXTRA 22
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 6ad6b4f..315479d 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -436,23 +436,18 @@ NewObjectDialog::~NewObjectDialog()
 //
 
 GotoLineDialog::GotoLineDialog(Window * pParent )
-: ModalDialog( pParent, IDEResId( RID_DLG_GOTOLINE ) ),
-aText( this, IDEResId( RID_FT_LINE ) ),
-aEdit( this, IDEResId( RID_ED_LINE ) ),
-aOKButton( this, IDEResId( RID_PB_OK ) ),
-aCancelButton( this, IDEResId( RID_PB_CANCEL ) )
+: ModalDialog(pParent, GotoLineDialog,
+modules/BasicIDE/ui/gotolinedialog.ui)
 {
-FreeResource();
-aEdit.GrabFocus();
-
-SetText( IDE_RESSTR(RID_STR_GETLINE) );
-aOKButton.SetClickHdl(LINK(this, GotoLineDialog, OkButtonHandler));
-
+get(m_pEdit, entry);
+get(m_pOKButton, ok);
+m_pEdit-GrabFocus();
+m_pOKButton-SetClickHdl(LINK(this, GotoLineDialog, OkButtonHandler));
 }
 
-sal_Int32 GotoLineDialog::GetLineNumber()
+sal_Int32 GotoLineDialog::GetLineNumber() const
 {
-return OUString( aEdit.GetText() ).toInt32();
+return m_pEdit-GetText().toInt32();
 }
 
 IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler)
@@ -460,7 +455,7 @@ IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler)
 if ( GetLineNumber() )
 EndDialog(1);
 else
-aEdit.SetText( aEdit.GetText(), Selection(0, 
aEdit.GetText().getLength() ));
+m_pEdit-SetText(m_pEdit-GetText(), Selection(0, 
m_pEdit-GetText().getLength()));
 return 0;
 }
 
diff --git a/basctl/source/basicide/moduldlg.hxx 
b/basctl/source/basicide/moduldlg.hxx
index 0ea6a2d..921aa7d 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -71,14 +71,12 @@ public:
 
 class GotoLineDialog : public ModalDialog
 {
-FixedText   aText;
-EditaEdit;
-OKButtonaOKButton;
-CancelButtonaCancelButton;
+Edit*   m_pEdit;
+OKButton*   m_pOKButton;
 DECL_LINK(OkButtonHandler, void *);
 public:
-GotoLineDialog( Window * pParent );
-sal_Int32   GetLineNumber();
+GotoLineDialog(Window * pParent);
+sal_Int32 GetLineNumber() const;
 };
 
 class ExportDialog : public ModalDialog
diff --git 

[Libreoffice-commits] core.git: basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk

[Caolán McNamara]

 basctl/UIConfig_basicide.mk |1 
 basctl/inc/basidesh.hrc |1 
 basctl/source/basicide/moduldl2.cxx |   60 ++-
 basctl/source/basicide/moduldlg.hxx |   17 ++--
 basctl/source/basicide/moduldlg.src |   37 -
 basctl/uiconfig/basicide/ui/newlibdialog.ui |  107 
 6 files changed, 140 insertions(+), 83 deletions(-)

New commits:
commit 40c6f8362c03473b78a7cb370f9523c61141ceec
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Dec 31 21:06:14 2013 +

convert new lib dialog to .ui

and a drive-by on some no .src InfoBox and ErrorBoxes to MessageDialog

Change-Id: Ideb58a0042ed45a49bff9b336622dfe11bb363ab

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 053f77b..ec1e99f 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
 $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
basctl/uiconfig/basicide/ui/gotolinedialog \
+   basctl/uiconfig/basicide/ui/newlibdialog \
basctl/uiconfig/basicide/ui/organizedialog \
 ))
 
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index b5077b8..4c58e73 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -34,7 +34,6 @@
 #define RID_TP_LIBS ( RID_BASICIDE_START + 38 )
 #define RID_TP_DLGS ( RID_BASICIDE_START + 39 )
 #define RID_DLG_LIBS( RID_BASICIDE_START + 40 )
-#define RID_DLG_NEWLIB  ( RID_BASICIDE_START + 42 )
 #define RID_DLG_EXPORT  ( RID_BASICIDE_START + 43 )
 #define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 )
 #define RID_PRINTDLG_STRLIST( RID_BASICIDE_START + 78 )
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 315479d..956f170 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include vcl/msgbox.hxx
+#include vcl/layout.hxx
 #include sot/storinfo.hxx
 
 #include moduldlg.hrc
@@ -291,7 +291,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, 
Selection )
 OUString aLibName = GetEntryText( pEntry, 0 );
 if ( aLibName.equalsIgnoreAsciiCase( Standard ) )
 {
-ErrorBox( this, WB_OK | WB_DEF_OK, 
IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB) ).Execute();
+MessageDialog(this, 
IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB)).Execute();
 return false;
 }
 
@@ -301,7 +301,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, 
Selection )
 if ( ( xModLibContainer.is()  xModLibContainer-hasByName( aLibName )  
xModLibContainer-isLibraryReadOnly( aLibName )  
!xModLibContainer-isLibraryLink( aLibName ) ) ||
  ( xDlgLibContainer.is()  xDlgLibContainer-hasByName( aLibName )  
xDlgLibContainer-isLibraryReadOnly( aLibName )  
!xDlgLibContainer-isLibraryLink( aLibName ) ) )
 {
-ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_LIBISREADONLY) 
).Execute();
+MessageDialog(this, IDE_RESSTR(RID_STR_LIBISREADONLY)).Execute();
 return false;
 }
 
@@ -353,7 +353,7 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, 
const OUString rNewNam
 }
 catch (const container::ElementExistException )
 {
-ErrorBox( this, WB_OK | WB_DEF_OK, 
IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED) ).Execute();
+MessageDialog(this, 
IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED)).Execute();
 return false;
 }
 catch (const container::NoSuchElementException )
@@ -366,9 +366,9 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, 
const OUString rNewNam
 if ( !bValid )
 {
 if ( rNewName.getLength()  30 )
-ErrorBox( this, WB_OK | WB_DEF_OK, 
IDE_RESSTR(RID_STR_LIBNAMETOLONG) ).Execute();
+MessageDialog(this, IDE_RESSTR(RID_STR_LIBNAMETOLONG)).Execute();
 else
-ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) 
).Execute();
+MessageDialog(this, IDE_RESSTR(RID_STR_BADSBXNAME)).Execute();
 }
 
 return bValid;
@@ -380,27 +380,24 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, 
const OUString rNewNam
 
 IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
 {
-if (IsValidSbxName(aEdit.GetText()))
+if (IsValidSbxName(m_pEdit-GetText()))
 EndDialog(1);
 else
 {
-ErrorBox(this, WB_OK | WB_DEF_OK,
- IDE_RESSTR(RID_STR_BADSBXNAME)).Execute();
-aEdit.GrabFocus();
+MessageDialog(this, IDE_RESSTR(RID_STR_BADSBXNAME)).Execute();
+m_pEdit-GrabFocus();
 }
 return 0;
 }
 
 NewObjectDialog::NewObjectDialog(Window 

[Libreoffice-commits] core.git: basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk

[Caolán McNamara]

 basctl/UIConfig_basicide.mk   |1 
 basctl/inc/basidesh.hrc   |1 
 basctl/inc/helpid.hrc |1 
 basctl/source/basicide/moduldl2.cxx   |   10 --
 basctl/source/basicide/moduldlg.cxx   |   79 -
 basctl/source/basicide/moduldlg.hrc   |6 -
 basctl/source/basicide/moduldlg.hxx   |4 
 basctl/source/basicide/moduldlg.src   |   56 
 basctl/uiconfig/basicide/ui/organizedialog.ui |  117 ++
 9 files changed, 160 insertions(+), 115 deletions(-)

New commits:
commit 2544a2a810bc9182d5f062cafb41b5be96111982
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Dec 24 09:41:27 2013 +

convert organize macros dialog to .ui

Change-Id: I210ab0bb294ddfefc3f60cffe64b72e5d8fa4650

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 013df6e..6f84bb4 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
+   basctl/uiconfig/basicide/ui/organizedialog \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 623cb0e..b064dcb 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -30,7 +30,6 @@
 #define RID_POPUP_BRKDLG( RID_BASICIDE_START + 10 )
 #define RID_POPUP_BRKPROPS  ( RID_BASICIDE_START + 11 )
 #define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
-#define RID_TD_ORGANIZE ( RID_BASICIDE_START + 36 )
 #define RID_TP_MODULS   ( RID_BASICIDE_START + 37 )
 #define RID_TP_LIBS ( RID_BASICIDE_START + 38 )
 #define RID_TP_DLGS ( RID_BASICIDE_START + 39 )
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index da3d500..4d6c92b 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -23,7 +23,6 @@
 #define HID_BASICIDE_OBJECTS  
BASCTL_HID_BASICIDE_OBJECTS
 #define HID_BASICIDE_MACROS   
BASCTL_HID_BASICIDE_MACROS
 #define HID_BASICIDE_LIBS 
BASCTL_HID_BASICIDE_LIBS
-#define HID_BASICIDE_ORG_TC   
BASCTL_HID_BASICIDE_ORG_TC
 
 #define HID_BASICIDE_MODULES_TREE 
BASCTL_HID_BASICIDE_MODULES_TREE
 #define HID_BASICIDE_LIBS_TREE
BASCTL_HID_BASICIDE_LIBS_TREE
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index b52eea9..6ad6b4f 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -506,7 +506,6 @@ LibPage::LibPage( Window * pParent )
 ,aLibText( this, IDEResId( RID_STR_LIB ) )
 ,aLibBox( this, IDEResId( RID_TRLBOX ) )
 ,aEditButton( this, IDEResId( RID_PB_EDIT ) )
-,aCloseButton( this, IDEResId( RID_PB_CLOSE ) )
 ,aPasswordButton( this, IDEResId( RID_PB_PASSWORD ) )
 ,aNewLibButton( this, IDEResId( RID_PB_NEWLIB ) )
 ,aInsertLibButton( this, IDEResId( RID_PB_APPEND ) )
@@ -524,7 +523,6 @@ LibPage::LibPage( Window * pParent )
 aExportButton.SetClickHdl( LINK( this, LibPage, ButtonHdl ) );
 aInsertLibButton.SetClickHdl( LINK( this, LibPage, ButtonHdl ) );
 aDelButton.SetClickHdl( LINK( this, LibPage, ButtonHdl ) );
-aCloseButton.SetClickHdl( LINK( this, LibPage, ButtonHdl ) );
 aLibBox.SetSelectHdl( LINK( this, LibPage, TreeListHighlightHdl ) );
 
 aBasicsBox.SetSelectHdl( LINK( this, LibPage, BasicSelectHdl ) );
@@ -532,7 +530,6 @@ LibPage::LibPage( Window * pParent )
 aLibBox.SetMode(ObjectMode::Module);
 aLibBox.EnableInplaceEditing(true);
 aLibBox.SetStyle( WB_HSCROLL | WB_BORDER | WB_TABSTOP );
-aCloseButton.GrabFocus();
 
 long aTabs[] = { 2, 30, 120 };
 aLibBox.SetTabs( aTabs, MAP_PIXEL );
@@ -581,8 +578,6 @@ void LibPage::CheckButtons()
 aInsertLibButton.Enable();
 aExportButton.Disable();
 aDelButton.Disable();
-if ( !aLibBox.HasFocus() )
-aCloseButton.GrabFocus();
 }
 else if ( ( xModLibContainer.is()  xModLibContainer-hasByName( 
aLibName )  xModLibContainer-isLibraryReadOnly( aLibName ) ) ||
   ( xDlgLibContainer.is()  xDlgLibContainer-hasByName( 
aLibName )  xDlgLibContainer-isLibraryReadOnly( aLibName ) ) )
@@ -676,11 +671,6 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
 Export();
 else if ( pButton == aDelButton )
 DeleteCurrent();
-else if ( pButton == aCloseButton )
-{
-EndTabDialog( 0 );
-return 0;
-}
 else if ( pButton == aPasswordButton )
 {
 SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
diff --git