[Libreoffice-commits] core.git: 2 commits - include/svtools include/vcl svtools/source svx/source vcl/inc vcl/jsdialog vcl/source

2023-08-31 Thread Szymon Kłos (via logerrit) 
 include/svtools/ctrlbox.hxx  |3 ++-
 include/vcl/weldutils.hxx|3 ++-
 include/vcl/window.hxx   |4 ++--
 svtools/source/control/ctrlbox.cxx   |   29 -
 svx/source/tbxctrls/tbcontrl.cxx |2 ++
 vcl/inc/jsdialog/jsdialogbuilder.hxx |2 +-
 vcl/jsdialog/executor.cxx|   11 ++-
 vcl/jsdialog/jsdialogbuilder.cxx |5 -
 vcl/source/app/weldutils.cxx |4 ++--
 vcl/source/window/window.cxx |   14 +-
 10 files changed, 58 insertions(+), 19 deletions(-)

New commits:
commit 038bce9b92d8b8f64d1f3797c02d3cde3a9471c2
Author: Szymon Kłos 
AuthorDate: Fri Aug 25 16:00:21 2023 +0200
Commit: Szymon Kłos 
CommitDate: Thu Aug 31 10:15:50 2023 +0200

jsdialog: combobox rendering with DPI set

Change-Id: I0efb8f765cc95e0eee02fb5905bc392fc754f3ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156114
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Caolán McNamara 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156250
Tested-by: Jenkins

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index dc6e04c3eb4e..f632753d35b1 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -621,7 +621,7 @@ public:
 virtual void set_active(int pos) override;
 virtual bool changed_by_direct_pick() const override;
 
-void render_entry(int pos);
+void render_entry(int pos, int dpix, int dpiy);
 };
 
 class JSNotebook final : public JSWidget
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 57a1c4db22d8..17c56d78e61e 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -133,7 +133,16 @@ bool ExecuteAction(const OUString& nWindowId, const 
OUString& rWidget, StringMap
 {
 auto pJSCombobox = dynamic_cast(pWidget);
 if (pJSCombobox)
-
pJSCombobox->render_entry(o3tl::toInt32(rData["data"]));
+{
+// pos;dpix;dpiy
+const OUString& sParams = rData["data"];
+const OUString aPos = sParams.getToken(0, ';');
+const OUString aDpiScaleX = sParams.getToken(1, ';');
+const OUString aDpiScaleY = sParams.getToken(2, ';');
+
+pJSCombobox->render_entry(o3tl::toInt32(aPos), 
o3tl::toInt32(aDpiScaleX),
+  o3tl::toInt32(aDpiScaleY));
+}
 return true;
 }
 }
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 8f7949c474ca..cd191d15a9d8 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1664,9 +1664,12 @@ void JSComboBox::set_active(int pos)
 
 bool JSComboBox::changed_by_direct_pick() const { return true; }
 
-void JSComboBox::render_entry(int pos)
+void JSComboBox::render_entry(int pos, int dpix, int dpiy)
 {
 ScopedVclPtrInstance pDevice(DeviceFormat::WITH_ALPHA);
+pDevice->SetDPIX(96.0 * dpix / 100);
+pDevice->SetDPIY(96.0 * dpiy / 100);
+
 Size aRenderSize = signal_custom_get_size(*pDevice);
 pDevice->SetOutputSize(aRenderSize);
 
commit 3fad74eb9def27788faddd74f5285120e0aefdd9
Author: Szymon Kłos 
AuthorDate: Fri Aug 25 18:01:32 2023 +0200
Commit: Szymon Kłos 
CommitDate: Thu Aug 31 10:15:45 2023 +0200

jsdialog: render font previews with hidpi

we pass dpi scale, let's use it to determine combobox entry size

Change-Id: I4088eca565b301c5693e52b1c05af1a335fc34fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156115
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Caolán McNamara 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156251
Tested-by: Jenkins

diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 0d7293fc77eb..39863b171b0e 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -340,7 +340,8 @@ private:
 voidLoadMRUEntries( const OUString& aFontMRUEntriesFile );
 voidSaveMRUEntries( const OUString& aFontMRUEntriesFile ) 
const;
 
-OutputDevice&   CachePreview(size_t nIndex, Point* pTopLeft);
+OutputDevice&   CachePreview(size_t nIndex, Point* pTopLeft,
+ sal_Int32 nDPIX = 96, sal_Int32 nDPIY = 96);
 
 public:
 FontNameBox(std::unique_ptr p);
diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx
index 8a4c128515a0..1987066badf8 100644
--- a/include/vcl/weldutils.hxx
+++ b/include/vcl/weldutils.hxx
@@ -464,7 +464,8 @@ VCL_DLLPUBLIC int GetMinimumEditHeight();
 VCL_DLLPUBLIC weld::Window* GetPopupParent(vcl::Window& rOutWin,

[Libreoffice-commits] core.git: 2 commits - include/svtools include/vcl svtools/source vcl/source

2021-05-03 Thread Noel Grandin (via logerrit) 
 include/svtools/htmlout.hxx   |5 ++---
 include/vcl/toolkit/button.hxx|3 +--
 svtools/source/svhtml/htmlout.cxx |4 ++--
 vcl/source/control/button.cxx |4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 5dad1d93a938cf995fd533b0c6a5cb7b0284f5c0
Author: Noel Grandin 
AuthorDate: Sun May 2 19:48:04 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon May 3 08:38:24 2021 +0200

sal_uLong->sal_Int32 in Button

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

diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx
index a470ea28d7c1..a9b81b0edb00 100644
--- a/include/vcl/toolkit/button.hxx
+++ b/include/vcl/toolkit/button.hxx
@@ -23,7 +23,6 @@
 #error "don't use this in new code"
 #endif
 
-#include 
 #include 
 #include 
 #include 
@@ -52,7 +51,7 @@ private:
 public:
 SAL_DLLPRIVATE DrawTextFlagsImplGetTextStyle( WinBits nWinStyle, 
DrawFlags nDrawFlags );
 SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev, 
Point& rPos, Size& rSize,
-  sal_uLong nImageSep,
+  sal_Int32 nImageSep,
   DrawTextFlags nTextStyle, 
tools::Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false );
 SAL_DLLPRIVATE void ImplSetFocusRect( const tools::Rectangle 
 );
 SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index b08cc9772d62..d6529c8bf311 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -205,7 +205,7 @@ DrawTextFlags Button::ImplGetTextStyle( WinBits nWinStyle, 
DrawFlags nDrawFlags
 
 void Button::ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos,
   Size& rSize,
-  sal_uLong nImageSep,
+  sal_Int32 nImageSep,
   DrawTextFlags nTextStyle, tools::Rectangle 
*pSymbolRect,
   bool bAddImageSep)
 {
@@ -842,7 +842,7 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice 
*pDev, DrawFlags nDrawFl
 Size aSize = rRect.GetSize();
 Point aPos = rRect.TopLeft();
 
-sal_uLong nImageSep = 1 + (pDev->GetTextHeight()-10)/2;
+sal_Int32 nImageSep = 1 + (pDev->GetTextHeight()-10)/2;
 if( nImageSep < 1 )
 nImageSep = 1;
 if ( mnDDStyle == PushButtonDropdownStyle::MenuButton ||
commit 13e49b4690f873b06175fe7b15454cba3c1e7a67
Author: Noel Grandin 
AuthorDate: Sun May 2 18:06:32 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon May 3 08:38:12 2021 +0200

sal_uLong->sal_uInt32 in HTMLOutFuncs

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

diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 14065fe4c801..8e87855b527c 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -24,7 +24,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -66,7 +65,7 @@ struct HTMLOutFuncs
 SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&,
 rtl_TextEncoding eDestEnc,
 OUString *pNonConvertableChars = nullptr );
-SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, 
sal_uInt8 nLen );
+SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uInt32 nHex, 
sal_uInt8 nLen );
 SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&, bool 
bXHTML = false );
 SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, 
const ImageMap&, const OUString&,
const HTMLOutEvent *pEventTable,
@@ -98,7 +97,7 @@ struct HTMLOutFuncs
 
 // 
 SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum(
-bool bValue, double fVal, sal_uLong nFormat,
+bool bValue, double fVal, sal_uInt32 nFormat,
 SvNumberFormatter& rFormatter,
 rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
 OUString *pNonConvertableChars = nullptr);
diff --git a/svtools/source/svhtml/htmlout.cxx 
b/svtools/source/svhtml/htmlout.cxx
index c75d293b6f77..b39609ad38d8 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -562,7 +562,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream,
 return rStream;
 }
 
-SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 
nLen )
+SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uInt32 nHex, sal_uInt8 
nLen )
 {

[Libreoffice-commits] core.git: 2 commits - include/svtools include/vcl svtools/source svx/source svx/uiconfig svx/UIConfig_svx.mk vcl/source vcl/unx

2020-02-06 Thread Caolán McNamara (via logerrit) 
 include/svtools/ctrlbox.hxx|   11 +
 include/vcl/combobox.hxx   |3 
 include/vcl/weld.hxx   |   14 +
 svtools/source/control/ctrlbox.cxx |   11 +
 svx/UIConfig_svx.mk|1 
 svx/source/inc/InterimItemWindow.hxx   |   35 
 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx |   46 -
 svx/source/sidebar/paragraph/ParaSpacingWindow.hxx |   20 --
 svx/source/tbxctrls/tbunocontroller.cxx|  182 +++--
 svx/uiconfig/ui/fontsizebox.ui |   29 +++
 vcl/source/app/salvtables.cxx  |   26 +++
 vcl/source/control/combobox.cxx|   15 +
 vcl/source/window/toolbox.cxx  |2 
 vcl/unx/gtk3/gtk3gtkinst.cxx   |   76 
 14 files changed, 359 insertions(+), 112 deletions(-)

New commits:
commit 8950cb8ae6a1621729ec43a6dd1c29cf04260797
Author: Caolán McNamara 
AuthorDate: Tue Feb 4 11:34:29 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 6 12:26:37 2020 +0100

weld SvxFontSizeBox_Impl

which enables making a native gtk widget a member of a toolbar

This widget wants to distinguish between a value getting selected
by the menu or not, which is fairly tricky

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

diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 8036d513ad05..30551c592dc2 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -428,6 +428,7 @@ class SVT_DLLPUBLIC SvtFontSizeBox
 bPtRelative:1,
 bStdSize:1;
 Link m_aChangeHdl;
+Link m_aFocusOutHdl;
 std::unique_ptr m_xComboBox;
 
 sal_uInt16 GetDecimalDigits() const { return nDecimalDigits; }
@@ -461,14 +462,24 @@ public:
 bool IsPtRelative() const { return bPtRelative; }
 
 void connect_changed(const Link& rLink) { 
m_aChangeHdl = rLink; }
+void connect_focus_out(const Link& rLink) { 
m_aFocusOutHdl = rLink; }
+void connect_key_press(const Link& rLink) { 
m_xComboBox->connect_key_press(rLink); }
 OUString get_active_text() const { return m_xComboBox->get_active_text(); }
 void set_active_text(const OUString& rText) { 
m_xComboBox->set_active_text(rText); }
 void set_sensitive(bool bSensitive) { 
m_xComboBox->set_sensitive(bSensitive); }
+int get_active() const { return m_xComboBox->get_active(); }
 int get_value() const;
 void set_value(int nValue);
 void save_value() { nSavedValue = get_value(); }
 int get_saved_value() const { return nSavedValue; }
 bool get_value_changed_from_saved() const { return get_value() != 
get_saved_value(); }
+int get_count() const { return m_xComboBox->get_count(); }
+OUString get_text(int i) const { return m_xComboBox->get_text(i); }
+void grab_focus() { m_xComboBox->grab_focus(); }
+bool has_focus() const { return m_xComboBox->has_focus(); }
+void connect_entry_activate(const Link& rLink) { 
m_xComboBox->connect_entry_activate(rLink); }
+void disable_entry_completion() { m_xComboBox->set_entry_completion(false, 
false); }
+boost::property_tree::ptree get_property_tree() const;
 
 private:
 SvtFontSizeBox(const SvtFontSizeBox&) = delete;
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index ff34c96411b4..f2f96dca1b37 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -152,6 +152,9 @@ public:
 voidSetNoSelection();
 tools::Rectangle   GetBoundingRectangle( sal_Int32  nItem ) const;
 
+// determine if Select was called due to something selected from the menu
+boolIsModifyByMenu() const;
+
 /** checks whether a certain point lies within the bounds of
 a list item and returns the item as well as the character position
 the point is at.
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 742290822c32..464047bdf843 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -27,6 +27,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -263,6 +265,8 @@ public:
 
 virtual css::uno::Reference 
get_drop_target() = 0;
 
+virtual boost::property_tree::ptree get_property_tree() const = 0;
+
 virtual ~Widget() {}
 };
 
@@ -643,7 +647,17 @@ public:
 virtual int find_id(const OUString& rId) const = 0;
 void remove_id(const OUString& rId) { remove(find_id(rId)); }
 
+/* m_aChangeHdl is called when the active item is changed. The can be due
+   to the user selecting a different item from the list or while typing
+   into the entry of a combo box with an entry.
+
+   Use changed_by_menu() to discover whether an item was actually selected
+

[Libreoffice-commits] core.git: 2 commits - include/svtools include/vcl solenv/clang-format svtools/source toolkit/source vcl/source

2020-01-28 Thread Caolán McNamara (via logerrit) 
 include/svtools/toolbarmenu.hxx|3 
 include/vcl/field.hxx  |  105 ---
 include/vcl/toolkit/field.hxx  |  125 +
 solenv/clang-format/blacklist  |1 
 svtools/source/control/toolbarmenu.cxx |7 -
 toolkit/source/awt/vclxtoolkit.cxx |2 
 toolkit/source/awt/vclxwindows.cxx |2 
 vcl/source/control/field.cxx   |2 
 vcl/source/control/field2.cxx  |2 
 vcl/source/window/builder.cxx  |2 
 10 files changed, 131 insertions(+), 120 deletions(-)

New commits:
commit f9eecb48bf675e77d15a9d926d1dd47f22835d67
Author: Caolán McNamara 
AuthorDate: Mon Jan 27 20:22:05 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 28 13:50:42 2020 +0100

move private TimeBox to toolkit-only headers

move private DateBox to toolkit-only headers
move private CurrencyBox to toolkit-only headers
move private PatternBox to toolkit-only headers
move private CurrencyField to toolkit-only headers
move private CurrencyFormatter to toolkit-only headers

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

diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 4e0b0a04d9ff..81fd9e5b8023 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -236,24 +236,6 @@ private:
 OUStringmaCustomUnitText;
 };
 
-
-class VCL_DLLPUBLIC CurrencyFormatter : public NumericFormatter
-{
-protected:
-CurrencyFormatter(Edit* pEdit);
-SAL_DLLPRIVATE void ImplCurrencyReformat( const OUString& rStr, 
OUString& rOutStr );
-virtual sal_Int64   GetValueFromString(const OUString& rStr) const 
override;
-
-public:
-virtual ~CurrencyFormatter() override;
-
-virtual voidReformat() override;
-
-virtual voidSetValue( sal_Int64 nNewValue ) override;
-virtual OUStringCreateFieldText( sal_Int64 nValue ) const override;
-};
-
-
 class VCL_DLLPUBLIC DateFormatter : public FormatterBase
 {
 private:
@@ -331,7 +313,6 @@ public:
 bool IsEnforceValidValue( ) const { return 
mbEnforceValidValue; }
 };
 
-
 class VCL_DLLPUBLIC TimeFormatter : public FormatterBase
 {
 private:
@@ -499,26 +480,6 @@ public:
 virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 };
 
-
-class VCL_DLLPUBLIC CurrencyField final : public SpinField, public 
CurrencyFormatter
-{
-public:
-CurrencyField( vcl::Window* pParent, WinBits nWinStyle );
-
-virtual boolPreNotify( NotifyEvent& rNEvt ) override;
-virtual boolEventNotify( NotifyEvent& rNEvt ) override;
-virtual voidDataChanged( const DataChangedEvent& rDCEvt ) 
override;
-
-virtual voidModify() override;
-
-virtual voidUp() override;
-virtual voidDown() override;
-virtual voidFirst() override;
-virtual voidLast() override;
-virtual voiddispose() override;
-};
-
-
 class VCL_DLLPUBLIC DateField : public SpinField, public DateFormatter
 {
 private:
@@ -549,7 +510,6 @@ public:
 virtual voiddispose() override;
 };
 
-
 class VCL_DLLPUBLIC TimeField final : public SpinField, public TimeFormatter
 {
 private:
@@ -581,22 +541,6 @@ public:
 virtual voiddispose() override;
 };
 
-
-class VCL_DLLPUBLIC PatternBox final : public ComboBox, public PatternFormatter
-{
-public:
-PatternBox( vcl::Window* pParent, WinBits 
nWinStyle );
-
-virtual boolPreNotify( NotifyEvent& rNEvt ) override;
-virtual boolEventNotify( NotifyEvent& rNEvt ) override;
-
-virtual voidModify() override;
-
-virtual voidReformatAll() override;
-virtual voiddispose() override;
-};
-
-
 class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter
 {
 SAL_DLLPRIVATE void ImplNumericReformat( const OUString& rStr, 
sal_Int64& rValue, OUString& rOutStr );
@@ -642,55 +586,6 @@ public:
 virtual voiddispose() override;
 };
 
-
-class VCL_DLLPUBLIC CurrencyBox final : public ComboBox, public 
CurrencyFormatter
-{
-public:
-explicitCurrencyBox( vcl::Window* pParent, WinBits 
nWinStyle );
-
-virtual boolPreNotify( NotifyEvent& rNEvt ) override;
-virtual boolEventNotify( NotifyEvent& rNEvt ) override;
-virtual voidDataChanged( const DataChangedEvent& rDCEvt ) 
override;
-
-virtual voidModify() override;
-
-virtual voidReformatAll() override;
-
-virtual voiddispose() override;
-};
-
-
-class VCL_DLLPUBLIC DateBox final : public ComboBox, public DateFormatter
-{
-public:
-

[Libreoffice-commits] core.git: 2 commits - include/svtools include/vcl

2018-01-15 Thread Stephan Bergmann 
 include/svtools/imapobj.hxx |1 -
 include/vcl/gdimtf.hxx  |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 420059de8576693b23661c64e55792ae992780ef
Author: Stephan Bergmann 
Date:   Mon Jan 15 21:35:32 2018 +0100

Remove unused GDI_METAFILE_LABEL_NOTFOUND

...unused since 22bd00fa7f6b90964e5eca03c314cdfa7ac2be12 "remove unused 
#defines
METAFILE_END and METAFILE_LABEL_NOTFOUND"

Change-Id: Ia9bcd4100f03c12c8e97b57cbfabfbf634248014
Reviewed-on: https://gerrit.libreoffice.org/47918
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 6785a7b9e3c3..2a0baaded027 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -41,7 +41,6 @@ class Gradient;
 
 
 #define GDI_METAFILE_END(size_t(0x))
-#define GDI_METAFILE_LABEL_NOTFOUND ((size_t)0x)
 
 enum class MtfConversion
 {
commit 6c5a1601d2ef47723a130e73953dd569f2cc856f
Author: Stephan Bergmann 
Date:   Mon Jan 15 21:19:39 2018 +0100

Remove unused IMAP_OBJ_NONE

...no other traces of it apart from its definition in
2351b6d4ba452ed9a261541cd8581ad43788d4db "INTEGRATION: CWS hedaburemove01:
 #72503# get rid of hedabu procedure: Moving headers to svtools/inc/svtools 
and
correspondent necessary changes"

Change-Id: I8a919b35f90acde5a72616b311a3e66c591c1e36
Reviewed-on: https://gerrit.libreoffice.org/47917
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index 04da290dda0d..9e396842ccf8 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -28,7 +28,6 @@ class Point;
 namespace tools { class Rectangle; }
 class SvStream;
 
-#define IMAP_OBJ_NONE   ((sal_uInt16)0x)
 #define IMAP_OBJ_RECTANGLE  (sal_uInt16(0x0001))
 #define IMAP_OBJ_CIRCLE (sal_uInt16(0x0002))
 #define IMAP_OBJ_POLYGON(sal_uInt16(0x0003))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/svtools include/vcl svtools/source vcl/inc vcl/source

2015-09-10 Thread Noel Grandin 
 include/svtools/grfmgr.hxx  |2 +-
 include/vcl/animate.hxx |6 +++---
 include/vcl/btndlg.hxx  |1 -
 include/vcl/graph.hxx   |4 ++--
 svtools/source/graphic/grfcache.cxx |2 +-
 vcl/inc/impgraph.hxx|6 +++---
 vcl/source/gdi/graph.cxx|4 ++--
 vcl/source/gdi/impgraph.cxx |6 +++---
 vcl/source/window/btndlg.cxx|9 ++---
 9 files changed, 17 insertions(+), 23 deletions(-)

New commits:
commit 9c162ddbea1507193b83fea2e2310f9eda5cfdb9
Author: Noel Grandin 
Date:   Tue Sep 8 14:41:10 2015 +0200

remove unused Link<> field

Change-Id: I121f133513a9897f38bd87be96c2cea39fbfc836

diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 5ab5a50..cf5206e 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -91,7 +91,6 @@ private:
 sal_uInt16  mnCurButtonId;
 sal_uInt16  mnFocusButtonId;
 boolmbFormat;
-Link<>  maClickHdl;
 
 SAL_DLLPRIVATE void ImplInitButtonDialogData();
 SAL_DLLPRIVATE VclPtr ImplCreatePushButton( ButtonDialogFlags 
nBtnFlags );
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 9c02cf9..ec9589a 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -260,13 +260,8 @@ void ButtonDialog::StateChanged( StateChangedType nType )
 
 void ButtonDialog::Click()
 {
-if ( !maClickHdl )
-{
-if ( IsInExecute() )
-EndDialog( GetCurButtonId() );
-}
-else
-maClickHdl.Call( this );
+if ( IsInExecute() )
+EndDialog( GetCurButtonId() );
 }
 
 void ButtonDialog::AddButton( const OUString& rText, sal_uInt16 nId,
commit 4db28b21499b866c44a6727118a9a94bf2f590ef
Author: Noel Grandin 
Date:   Tue Sep 8 14:28:58 2015 +0200

convert Link<> to typed

Change-Id: I7aa46c5cbaf70bea5756a4066bc620b3c40dedee

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 3ea3097..c72e0ee 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -415,7 +415,7 @@ public:
 boolIsAnimated() const { return mbAnimated; }
 boolIsEPS() const { return mbEPS; }
 
-Link<>  GetAnimationNotifyHdl() const { return 
GetGraphic().GetAnimationNotifyHdl(); }
+Link   GetAnimationNotifyHdl() const { return 
GetGraphic().GetAnimationNotifyHdl(); }
 
 boolSwapOut();
 boolSwapOut( SvStream* pOStm );
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 801d9e4..3bc5ecb 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -152,8 +152,8 @@ public:
 
 CycleMode   GetCycleMode() const { return meCycleMode; }
 
-voidSetNotifyHdl( const Link<>& rLink ) { maNotifyLink = 
rLink; }
-const Link<>&   GetNotifyHdl() const { return maNotifyLink; }
+voidSetNotifyHdl( const Link& rLink ) { 
maNotifyLink = rLink; }
+const Link& GetNotifyHdl() const { return maNotifyLink; }
 
 size_t  Count() const { return maList.size(); }
 boolInsert( const AnimationBitmap& rAnimationBitmap );
@@ -205,7 +205,7 @@ private:
 std::vector< AnimationBitmap* > maList;
 std::vector< ImplAnimView* >maViewList;
 
-Link<>  maNotifyLink;
+Link maNotifyLink;
 BitmapExmaBitmapEx;
 Timer   maTimer;
 SizemaGlobalSize;
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index cc2890d..c7d2ceb 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -155,8 +155,8 @@ public:
 voidStopAnimation( OutputDevice* pOutputDevice = NULL,
long nExtraData = 0L );
 
-voidSetAnimationNotifyHdl( const Link<>& rLink );
-Link<>  GetAnimationNotifyHdl() const;
+voidSetAnimationNotifyHdl( const Link& 
rLink );
+Link  GetAnimationNotifyHdl() const;
 
 sal_uLong   GetAnimationLoopCount() const;
 
diff --git a/svtools/source/graphic/grfcache.cxx 
b/svtools/source/graphic/grfcache.cxx
index 59bbeb2..ccc2440 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -262,7 +262,7 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& 
rSubstitute )
 // create substitute for graphic;
 const Size  aPrefSize( rSubstitute.GetPrefSize() );
 const MapMode   aPrefMapMode( rSubstitute.GetPrefMapMode() );
-const Link<>aAnimationNotifyHdl( 
rSubstitute.GetAnimationNotifyHdl() );
+const Link aAnimationNotifyHdl( 
rSubstitute.GetAnimationNotifyHdl() );
 const GraphicType   eOldType =

[Libreoffice-commits] core.git: 2 commits - include/svtools include/vcl officecfg/registry sc/inc sc/source sc/uiconfig svtools/source svx/source vcl/source

2013-06-18 Thread Caolán McNamara 
 include/svtools/accessibilityoptions.hxx   |5 
 include/vcl/settings.hxx   |6 -
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   13 ++
 sc/inc/globstr.hrc |   11 --
 sc/inc/sc.hrc  |4 
 sc/source/ui/inc/tpusrlst.hxx  |   10 +
 sc/source/ui/optdlg/tpusrlst.cxx   |   69 +
 sc/source/ui/src/globstr.src   |4 
 sc/source/ui/src/scstring.src  |   10 -
 sc/uiconfig/scalc/ui/optsortlists.ui   |   44 +++-
 svtools/source/config/accessibilityoptions.cxx |   57 ++
 svx/source/dialog/dlgctrl.cxx  |   21 +++
 svx/source/gallery2/galctrl.cxx|2 
 svx/source/tbxctrls/fontworkgallery.cxx|2 
 svx/source/xoutdev/xtabdash.cxx|2 
 svx/source/xoutdev/xtabhtch.cxx|2 
 svx/source/xoutdev/xtablend.cxx|2 
 vcl/source/app/settings.cxx|6 -
 18 files changed, 209 insertions(+), 61 deletions(-)

New commits:
commit d1dda534fbf27e107937c8acff594be3d6ba6810
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jun 18 16:35:24 2013 +0100

use sizegroups and shown/hidden buttons to stop ui jitter

i.e. duplicate the buttons rather than change their content and have the 
same
handlers for both variants.  Hide the one we don't want at any given time 
and
use size-groups to get the same width regardless of the combination shown. 
All
so the ui doesn't jump around the place as the button content changes.

Change-Id: Icca938a6381da1feaf43fd11779d1d6d94d5d3a0

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 41b6c47..f9fda26 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -673,13 +673,12 @@
 
 #define STR_FUN_TEXT_SELECTION_COUNT546
 
-#define STR_DISMISS 547
-#define STR_QUERYREMOVE 548
-#define STR_COPYLIST549
-#define STR_COPYFROM550
-#define STR_COPYERR 551
+#define STR_QUERYREMOVE 547
+#define STR_COPYLIST548
+#define STR_COPYFROM549
+#define STR_COPYERR 550
 
-#define STR_COUNT   552
+#define STR_COUNT   551
 
 #endif
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 8579644..a5d6973 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -718,10 +718,10 @@
 #define SCSTR_COLUMN(STR_START + 13)
 #define SCSTR_ROW   (STR_START + 14)
 #define SCSTR_NEW   (STR_START + 15)
-#define SCSTR_ADD   (STR_START + 16)
+
 #define SCSTR_REMOVE(STR_START + 17)
 #define SCSTR_CANCEL(STR_START + 18)
-#define SCSTR_MODIFY(STR_START + 19)
+
 #define SCSTR_SHOWTABLE (STR_START + 20)
 #define SCSTR_HIDDENTABLES  (STR_START + 21)
 
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index 331c1a40..08b92cb 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -54,16 +54,18 @@ private:
 VclMultiLineEdit*   mpEdEntries;
 FixedText*  mpFtCopyFrom;
 Edit*   mpEdCopyFrom;
+
 PushButton* mpBtnNew;
+PushButton* mpBtnDiscard;
+
 PushButton* mpBtnAdd;
+PushButton* mpBtnModify;
+
 PushButton* mpBtnRemove;
+
 PushButton* mpBtnCopy;
 
 const StringaStrQueryRemove;
-String  aStrNew;
-const StringaStrCancel;
-const StringaStrAdd;
-const StringaStrModify;
 const StringaStrCopyList;
 const StringaStrCopyFrom;
 const StringaStrCopyErr;
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index b0e92ca..ad86994 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -58,9 +58,6 @@ ScTpUserLists::ScTpUserLists( Window*   pParent,
   OptSortLists, modules/scalc/ui/optsortlists.ui,
   rCoreAttrs ),
 aStrQueryRemove ( ScGlobal::GetRscString( STR_QUERYREMOVE ) ),
-aStrCancel  ( ScGlobal::GetRscString( STR_DISMISS ) ),
-aStrAdd ( ScResId( SCSTR_ADD ) ),
-aStrModify  ( ScResId( SCSTR_MODIFY ) ),
 aStrCopyList( ScGlobal::GetRscString( STR_COPYLIST ) ),
 aStrCopyFrom( ScGlobal::GetRscString( STR_COPYFROM ) ),
 aStrCopyErr ( ScGlobal::GetRscString( STR_COPYERR ) ),
@@ -81,12 +78,12 @@ ScTpUserLists::ScTpUserLists( Window*   pParent,
 get(mpFtCopyFrom, copyfromlabel);
 get(mpEdCopyFrom, copyfrom);