[Libreoffice-commits] core.git: 2 commits - sfx2/uiconfig vcl/inc vcl/win
sfx2/uiconfig/ui/linkeditdialog.ui | 40 ++--
vcl/inc/win/salbmp.h |2
vcl/win/gdi/salbmp.cxx | 119 -
3 files changed, 20 insertions(+), 141 deletions(-)
New commits:
commit da3d3fad1515348b6c4f2303db83ec03594f0597
Author: Aron Budea
AuthorDate: Sun Apr 18 06:27:33 2021 +0200
Commit: Caolán McNamara
CommitDate: Mon Apr 19 18:38:46 2021 +0200
tdf#141244 Modify DDE Link dialog was empty
Regression from de01c0c1d0f80ffec3882625d77c02ab806f6c7a.
Apparently entries must precede ones in
.ui files.
Change-Id: Ie91897d126527d3b30935a46b31f0a53b2837c53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114237
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sfx2/uiconfig/ui/linkeditdialog.ui
b/sfx2/uiconfig/ui/linkeditdialog.ui
index 36e9f3d6930f..d39c829052e4 100644
--- a/sfx2/uiconfig/ui/linkeditdialog.ui
+++ b/sfx2/uiconfig/ui/linkeditdialog.ui
@@ -3,11 +3,6 @@
-
-
-
-
-
False
6
Modify DDE Link
@@ -15,6 +10,11 @@
0
0
dialog
+
+
+
+
+
@@ -143,16 +143,16 @@
-
-
-Lists the
application that last saved the source file. %PRODUCTNAME applications have the
server name soffice.
-
-
True
True
True
True
True
+
+
+Lists the
application that last saved the source file. %PRODUCTNAME applications have the
server name soffice.
+
+
1
@@ -161,16 +161,16 @@
-
-
-Path to the
source file. Relative paths must be expressed by full URI, for example, with
file://.
-
-
True
True
True
True
True
+
+
+Path to the
source file. Relative paths must be expressed by full URI, for example, with
file://.
+
+
1
@@ -179,16 +179,16 @@
-
-
-Lists the
section or object that the link refers to in the source file. If you want, you
can enter a new section or object here.
-
-
True
True
True
True
True
+
+
+Lists the
section or object that the link refers to in the source file. If you want, you
can enter a new section or object here.
+
+
1
commit 09a801915101f1cd6b39b20288fb55d76ad24c62
Author: Noel Grandin
AuthorDate: Mon Apr 19 14:54:34 2021 +0200
Commit: Noel Grandin
CommitDate: Mon Apr 19 18:38:28 2021 +0200
nobody uses RLE display hardware anymore
Change-Id: I07aa5b24425007ac82fedb28d3c4f0ad474dca14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114270
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index 5167a7e4a939..d48203840b76 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -55,8 +55,6 @@ public:
static HGLOBAL ImplCreateDIB( const Size& rSize, vcl::PixelFormat
ePixelFormat, const BitmapPalette& rPal );
static HANDLE ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB );
static sal_uInt16 ImplGetDIBColorCount( HGLOBAL hDIB );
-static void ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE*
pDstBuf,
- const Size& rSizePixel, bool
bRLE4 );
public:
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index 387a2e6e2d99..ed35d7b6d3da 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -801,32 +801,6 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer(
BitmapAccessMode /*nMode*/ )
PBITMAPINFO pBI = static_cast(GlobalLock( mhDIB
));
PBITMAPINFOHEADER pBIH = >bmiHeader;
-if( ( pBIH->biCompression == BI_RLE4 ) || ( pBIH->biCompression ==
BI_RLE8 ) )
-{
-SizeaSizePix( pBIH->biWidth, pBIH->biHeight );
-
[Libreoffice-commits] core.git: 2 commits - sfx2/uiconfig solenv/sanitizers sw/source sw/uiconfig sw/UIConfig_swriter.mk
sfx2/uiconfig/ui/classificationbox.ui |2 -
solenv/sanitizers/ui/modules/swriter.suppr |1
sw/UIConfig_swriter.mk |1
sw/source/uibase/ribbar/workctrl.cxx | 47 ++---
sw/uiconfig/swriter/ui/jumpposbox.ui | 24 ++
5 files changed, 57 insertions(+), 18 deletions(-)
New commits:
commit 9b8180dfb71e139d78be487967f741e1f9f46d51
Author: Caolán McNamara
AuthorDate: Thu Feb 6 20:36:03 2020 +
Commit: Caolán McNamara
CommitDate: Fri Feb 7 12:47:48 2020 +0100
remove unnecessary include
Change-Id: I205966f40472d187c63717ddf6e8153584c6b284
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88141
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/ribbar/workctrl.cxx
b/sw/source/uibase/ribbar/workctrl.cxx
index 08d569a01811..0f16edc98394 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -42,7 +42,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
commit ed87f7e96b7f4f9201fa17bc573d4ef8ba9ab4e4
Author: Caolán McNamara
AuthorDate: Thu Feb 6 20:25:12 2020 +
Commit: Caolán McNamara
CommitDate: Fri Feb 7 12:47:35 2020 +0100
weld SwJumpToSpecificBox_Impl
Change-Id: I4c140bccf821b6ee0ce0e734cebae722267f5430
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88140
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sfx2/uiconfig/ui/classificationbox.ui
b/sfx2/uiconfig/ui/classificationbox.ui
index adc04d4d4df4..b94372831e4a 100644
--- a/sfx2/uiconfig/ui/classificationbox.ui
+++ b/sfx2/uiconfig/ui/classificationbox.ui
@@ -1,6 +1,6 @@
-
+
True
diff --git a/solenv/sanitizers/ui/modules/swriter.suppr
b/solenv/sanitizers/ui/modules/swriter.suppr
index 1678e515eed9..1034cb94c770 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -110,6 +110,7 @@
sw/uiconfig/swriter/ui/insertscript.ui://GtkLabel[@id='label1'] orphan-label
sw/uiconfig/swriter/ui/insertscript.ui://GtkEntry[@id='scripttype']
no-labelled-by
sw/uiconfig/swriter/ui/insertscript.ui://GtkEntry[@id='urlentry']
no-labelled-by
sw/uiconfig/swriter/ui/insertscript.ui://GtkTextView[@id='textentry']
no-labelled-by
+sw/uiconfig/swriter/ui/jumpposbox.ui://GtkEntry[@id='jumppos'] no-labelled-by
sw/uiconfig/swriter/ui/labelformatpage.ui://GtkSpinButton[@id='top']
duplicate-mnemonic
sw/uiconfig/swriter/ui/labelformatpage.ui://GtkDrawingArea[@id='preview']
no-labelled-by
sw/uiconfig/swriter/ui/linenumbering.ui://GtkLabel[@id='format'] orphan-label
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 339c7774d528..6431d1063cb3 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -172,6 +172,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/insertsectiondialog \
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
+ sw/uiconfig/swriter/ui/jumpposbox \
sw/uiconfig/swriter/ui/labeldialog \
sw/uiconfig/swriter/ui/labelformatpage \
sw/uiconfig/swriter/ui/labeloptionspage \
diff --git a/sw/source/uibase/ribbar/workctrl.cxx
b/sw/source/uibase/ribbar/workctrl.cxx
index 87bf21e93725..08d569a01811 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include
@@ -700,42 +701,54 @@ VclPtr
SwPreviewZoomControl::CreateItemWindow( vcl::Window *pParent
namespace {
-class SwJumpToSpecificBox_Impl : public NumericField
+class SwJumpToSpecificBox_Impl final : public InterimItemWindow
{
+std::unique_ptr m_xWidget;
+
sal_uInt16 const nSlotId;
+DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
+DECL_LINK(SelectHdl, weld::Entry&, bool);
public:
SwJumpToSpecificBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot);
-
-protected:
-voidSelect();
-virtual boolEventNotify( NotifyEvent& rNEvt ) override;
+virtual void dispose() override
+{
+m_xWidget.reset();
+InterimItemWindow::dispose();
+}
+virtual ~SwJumpToSpecificBox_Impl() override
+{
+disposeOnce();
+}
};
}
+IMPL_LINK(SwJumpToSpecificBox_Impl, KeyInputHdl, const KeyEvent&, rKEvt, bool)
+{
+return ChildKeyInput(rKEvt);
+}
+
SwJumpToSpecificBox_Impl::SwJumpToSpecificBox_Impl(vcl::Window* pParent,
sal_uInt16 nSlot)
-: NumericField(pParent, WB_HIDE | WB_BORDER)
+: InterimItemWindow(pParent, "modules/swriter/ui/jumpposbox.ui",
"JumpPosBox")
+, m_xWidget(m_xBuilder->weld_entry("jumppos"))
, nSlotId(nSlot)
{
-SetSizePixel(LogicToPixel(Size(16, 12), MapMode(MapUnit::MapAppFont)));
+m_xWidget->connect_key_press(LINK(this, SwJumpToSpecificBox_Impl,
KeyInputHdl));
+
[Libreoffice-commits] core.git: 2 commits - sfx2/uiconfig
sfx2/uiconfig/ui/startcenter.ui |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 5992dc43c31dcf4f458a6c9e5eed0adf0e97be97 Author: Jan Holesovsky ke...@collabora.com Date: Thu Nov 14 17:29:48 2013 +0100 startcenter: Make the separator shorter. Change-Id: Ie03a544cd4e98b39b2571815210adbb3352ab22e diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index fef071a..42e093f 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -94,6 +94,8 @@ object class=GtkSeparator id=separator1 property name=visibleTrue/property property name=can_focusFalse/property +property name=margin_left6/property +property name=margin_right6/property /object packing property name=expandFalse/property commit 445b30a311b5f8e2ab9b332a16c233012340b284 Author: Jan Holesovsky ke...@collabora.com Date: Thu Nov 14 17:27:10 2013 +0100 startcenter: Fix conflicting accelerator. Change-Id: I5c034abd30b502334968c16c60b22713be45d31c diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 8af9ad8..fef071a 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -309,7 +309,7 @@ property name=orientationvertical/property child object class=GtkButton id=extensions -property name=label translatable=yes_Extensions/property +property name=label translatable=yesE_xtensions/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sfx2/uiconfig svx/inc
sfx2/uiconfig/ui/documentfontspage.ui |7 +++ sfx2/uiconfig/ui/documentinfopage.ui |1 + svx/inc/helpid.hrc| 17 - 3 files changed, 4 insertions(+), 21 deletions(-) New commits: commit 93b850b2a3db792468f5e70272b22fb76aff474f Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 21 14:44:24 2013 + remove unused hids Change-Id: I02343ca6fe9d0c642cd8ebf4723582c7c25889fb diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index b4a2737..afd9484 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -153,23 +153,6 @@ #define HID_POPUP_LINE SVX_HID_POPUP_LINE #define HID_POPUP_LINEEND SVX_HID_POPUP_LINEEND #define HID_POPUP_LINEEND_CTRL SVX_HID_POPUP_LINEEND_CTRL -#define HID_REDLINING_FILTER_BTN_REF SVX_HID_REDLINING_FILTER_BTN_REF -#define HID_REDLINING_FILTER_CB_ACTION SVX_HID_REDLINING_FILTER_CB_ACTION -#define HID_REDLINING_FILTER_CB_AUTOR SVX_HID_REDLINING_FILTER_CB_AUTOR -#define HID_REDLINING_FILTER_CB_COMMENT SVX_HID_REDLINING_FILTER_CB_COMMENT -#define HID_REDLINING_FILTER_CB_DATE SVX_HID_REDLINING_FILTER_CB_DATE -#define HID_REDLINING_FILTER_CB_RANGE SVX_HID_REDLINING_FILTER_CB_RANGE -#define HID_REDLINING_FILTER_DF_DATE SVX_HID_REDLINING_FILTER_DF_DATE -#define HID_REDLINING_FILTER_DF_DATE2 SVX_HID_REDLINING_FILTER_DF_DATE2 -#define HID_REDLINING_FILTER_ED_COMMENT SVX_HID_REDLINING_FILTER_ED_COMMENT -#define HID_REDLINING_FILTER_ED_RANGE SVX_HID_REDLINING_FILTER_ED_RANGE -#define HID_REDLINING_FILTER_IB_CLOCK SVX_HID_REDLINING_FILTER_IB_CLOCK -#define HID_REDLINING_FILTER_IB_CLOCK2 SVX_HID_REDLINING_FILTER_IB_CLOCK2 -#define HID_REDLINING_FILTER_LB_ACTION SVX_HID_REDLINING_FILTER_LB_ACTION -#define HID_REDLINING_FILTER_LB_AUTOR SVX_HID_REDLINING_FILTER_LB_AUTOR -#define HID_REDLINING_FILTER_LB_DATE SVX_HID_REDLINING_FILTER_LB_DATE -#define HID_REDLINING_FILTER_TF_DATE SVX_HID_REDLINING_FILTER_TF_DATE -#define HID_REDLINING_FILTER_TF_DATE2 SVX_HID_REDLINING_FILTER_TF_DATE2 #define HID_REDLINING_TABCONTROL SVX_HID_REDLINING_TABCONTROL #define HID_REDLINING_VIEW_DG_VIEW SVX_HID_REDLINING_VIEW_DG_VIEW #define HID_REDLINING_VIEW_DG_VIEW_HEADER SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER commit 128910b6c338cc78822d405e2dc03acc02bd48d8 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 21 14:33:13 2013 + HIG, consistent border width for properties page Change-Id: Iacaa53c167230d40bd7e68216ff9deb97c528063 diff --git a/sfx2/uiconfig/ui/documentfontspage.ui b/sfx2/uiconfig/ui/documentfontspage.ui index 0003f47..89888e2 100644 --- a/sfx2/uiconfig/ui/documentfontspage.ui +++ b/sfx2/uiconfig/ui/documentfontspage.ui @@ -4,16 +4,15 @@ object class=GtkGrid id=DocumentFontsPage property name=visibleTrue/property property name=can_focusFalse/property -property name=row_spacing12/property -property name=column_spacing18/property +property name=border_width6/property +property name=row_spacing6/property +property name=column_spacing12/property child object class=GtkCheckButton id=embedFonts property name=label translatable=yes_Embed fonts in the document/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=use_action_appearanceFalse/property property name=use_underlineTrue/property property name=xalign0/property property name=draw_indicatorTrue/property diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui index 72514654..eeccbd0 100644 --- a/sfx2/uiconfig/ui/documentinfopage.ui +++ b/sfx2/uiconfig/ui/documentinfopage.ui @@ -5,6 +5,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property +property name=border_width6/property property name=row_spacing6/property property name=column_spacing18/property child ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
