[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source cui/uiconfig extras/source include/cui include/sfx2 include/svx include/vcl sc/source sd/inc sd/source sfx2/source solenv/bin svx/source s
cui/Library_cui.mk |1
cui/source/dialogs/SpellAttrib.cxx | 105 -
cui/source/dialogs/SpellAttrib.hxx | 100 -
cui/source/dialogs/SpellDialog.cxx | 1654 ++-
cui/source/dialogs/cuicharmap.cxx|2
cui/source/factory/dlgfact.cxx | 27
cui/source/factory/dlgfact.hxx | 16
cui/source/factory/init.cxx |4
cui/source/inc/SpellDialog.hxx | 189 +-
cui/uiconfig/ui/spellingdialog.ui| 159 +
extras/source/glade/libreoffice-catalog.xml.in |3
include/cui/cuicharmap.hxx |2
include/sfx2/basedlgs.hxx|3
include/svx/ClassificationEditView.hxx |4
include/svx/langbox.hxx |2
include/svx/svxdlg.hxx |6
include/vcl/edit.hxx |2
include/vcl/weld.hxx | 10
sc/source/ui/inc/spelleng.hxx|4
sc/source/ui/view/cellsh.cxx |4
sc/source/ui/view/spelleng.cxx | 33
sd/inc/Outliner.hxx |6
sd/source/ui/view/Outliner.cxx | 20
sfx2/source/appl/appinit.cxx |6
sfx2/source/dialog/basedlgs.cxx | 15
solenv/bin/native-code.py|1
svx/source/dialog/SpellDialogChildWindow.cxx |6
svx/source/dialog/rubydialog.cxx |6
svx/source/dialog/srchdlg.cxx|6
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx |9
vcl/source/app/salvtables.cxx| 33
vcl/source/control/edit.cxx |4
vcl/source/edit/vclmedit.cxx |4
vcl/unx/gtk3/gtk3gtkinst.cxx | 50
34 files changed, 1369 insertions(+), 1127 deletions(-)
New commits:
commit 5261417cbb3051b812164838d19c0f748573df45
Author: Caolán McNamara
AuthorDate: Fri Jun 14 21:56:44 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jun 21 21:33:30 2019 +0200
weld SpellDialog
a) use EditEngine instead of TextEngine as the former can be hosted in a
foreign widget
b) use a SfxGrabBagItem to hold the custom spellchecking info inside the
EditEngine
c) in longer paragraphs the current word is now auto-scrolled into view
d) rename Invalidate to InvalidateDialog
Change-Id: Ic6db019c32cdfd5f354c58ee7394fdaa040b86e1
Reviewed-on: https://gerrit.libreoffice.org/74119
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index b02520529fab..e3cd0c36ba4f 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -135,7 +135,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/SignSignatureLineDialog \
cui/source/dialogs/sdrcelldlg \
cui/source/dialogs/showcols \
-cui/source/dialogs/SpellAttrib \
cui/source/dialogs/SpellDialog \
cui/source/dialogs/splitcelldlg \
cui/source/dialogs/srchxtra \
diff --git a/cui/source/dialogs/SpellAttrib.cxx
b/cui/source/dialogs/SpellAttrib.cxx
deleted file mode 100644
index 9d761a55b3f1..
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ /dev/null
@@ -1,105 +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 .
- */
-
-#include "SpellAttrib.hxx"
-#include
-
-using namespace svx;
-using namespace com::sun::star::linguistic2;
-using namespace com::sun::star::uno;
-
-
-SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) :
-TextAttrib(TEXTATTR_SPELL_ERROR),
-m_aSpellErrorDescription( rDesc )
-{
-}
-
-
-void SpellErrorAttrib::SetFont( vcl::Font& ) const
-{
-//this attribute doesn't have a visual effect
-}
-
-
-std:
[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source cui/uiconfig extras/source include/svtools include/svx include/vcl svtools/inc svtools/source svtools/uiconfig svtools/UIConfig_svt.mk svx
cui/Library_cui.mk |1
cui/source/inc/border.hxx| 133 +-
cui/source/tabpages/border.cxx | 869 ++-
cui/source/tabpages/borderconn.cxx | 291 --
cui/source/tabpages/borderconn.hxx | 57 -
cui/source/tabpages/tpbitmap.cxx |1
cui/uiconfig/ui/borderpage.ui| 153 ++-
extras/source/glade/libreoffice-catalog.xml.in |3
include/svtools/ctrlbox.hxx | 87 +
include/svtools/valueset.hxx | 14
include/svx/colorbox.hxx |1
include/svx/colorwindow.hxx |1
include/svx/frmsel.hxx | 24
include/vcl/outdev.hxx |3
include/vcl/weld.hxx |3
svtools/UIConfig_svt.mk |1
svtools/inc/borderline.hrc | 41
svtools/source/control/ctrlbox.cxx | 298 ++
svtools/source/control/valueset.cxx | 140 +++
svtools/uiconfig/ui/linewindow.ui| 54 +
svx/source/accessibility/AccessibleFrameSelector.cxx | 442 +++--
svx/source/dialog/frmsel.cxx | 78 -
svx/source/inc/AccessibleFrameSelector.hxx | 111 +-
svx/source/inc/frmselimpl.hxx|6
svx/source/tbxctrls/tbcontrl.cxx | 11
vcl/source/app/salvtables.cxx| 11
vcl/source/control/button.cxx|3
vcl/source/outdev/rect.cxx |6
vcl/source/window/builder.cxx|2
vcl/unx/gtk3/gtk3gtkinst.cxx | 15
vcl/workben/vcldemo.cxx |2
31 files changed, 1647 insertions(+), 1215 deletions(-)
New commits:
commit 229483707c3ccb48d008d37f856bbeb6df199a90
Author: Caolán McNamara
AuthorDate: Mon Sep 3 16:06:49 2018 +0100
Commit: Caolán McNamara
CommitDate: Wed Sep 5 13:36:35 2018 +0200
weld SvxBorderTabPage
Change-Id: I33f12f160ac5fea14c9a53c3846c6d31c7fd0084
Reviewed-on: https://gerrit.libreoffice.org/59954
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index f2926cfe43d7..1c6185488f36 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -183,7 +183,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/tabpages/autocdlg \
cui/source/tabpages/backgrnd \
cui/source/tabpages/bbdlg \
-cui/source/tabpages/borderconn \
cui/source/tabpages/border \
cui/source/tabpages/chardlg \
cui/source/tabpages/connect \
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index e59638036e7d..80dea4edc8b0 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -19,12 +19,15 @@
#ifndef INCLUDED_CUI_SOURCE_INC_BORDER_HXX
#define INCLUDED_CUI_SOURCE_INC_BORDER_HXX
+#include
#include
#include
#include
#include
+#include
#include
#include
+#include
#include
#include
#include
@@ -38,6 +41,37 @@ namespace editeng
class SvxBorderLine;
}
+class ShadowControlsWrapper
+{
+public:
+explicit ShadowControlsWrapper(SvtValueSet& rVsPos,
weld::MetricSpinButton& rMfSize, ColorListBox& rLbColor);
+
+SvxShadowItem GetControlValue(const SvxShadowItem& rItem) const;
+void SetControlValue(const SvxShadowItem& rItem);
+
+private:
+SvtValueSet&mrVsPos;
+weld::MetricSpinButton& mrMfSize;
+ColorListBox& mrLbColor;
+};
+
+class MarginControlsWrapper
+{
+public:
+explicit MarginControlsWrapper(weld::MetricSpinButton& rMfLeft,
weld::MetricSpinButton& rMfRight,
+ weld::MetricSpinButton& rMfTop,
weld::MetricSpinButton& rMfBottom);
+
+SvxMarginItem GetControlValue(const SvxMarginItem& rItem) const;
+void SetControlValue(const SvxMarginItem& rItem);
+
+bool get_value_changed_from_saved() const;
+
+private:
+weld::MetricSpinButton& mrLeftWrp;
+weld::MetricSpinButton& mrRightWrp;
+weld::MetricSpinButton& mrTopWrp;
+weld::MetricSpinButton& mrBottomWrp;
+};
class SvxBorderTabPage : public SfxTabPage
{
@@ -65,49 +99,15 @@ protected:
virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
private:
-SvxBorderTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs );
-
-// Controls
-VclPtr m_pWndPresets;
-VclPtr m_pUserDefFT;
-VclPtr m_pFrameSel;
-
-VclPtrm_pLbLineStyle;
-VclPtrm_pLbLineColor;
-VclPtrm_pLineWidthMF;
-
-VclPtr m_pSpacingFrame;
-VclPtr
[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source cui/uiconfig extras/source officecfg/registry
cui/Library_cui.mk |1
cui/source/dialogs/charwin.cxx | 213 +
cui/source/dialogs/cuicharmap.cxx | 504 +++--
cui/source/factory/init.cxx|5
cui/source/inc/charwin.hxx | 56 +
cui/source/inc/cuicharmap.hxx | 22
cui/uiconfig/ui/specialcharacters.ui | 278 ++-
extras/source/glade/libreoffice-catalog.xml.in |3
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 17
9 files changed, 854 insertions(+), 245 deletions(-)
New commits:
commit 710a39414569995bd5a8631a948c939dc73bcef9
Author: Akshay Deep
Date: Thu May 11 13:27:38 2017 +0530
GSoC: Glyph View and Recent Characters Control in Special Characters dialog
Change-Id: Ia55f3fefe7c14327cff2e996ab0038dc52f9b017
Reviewed-on: https://gerrit.libreoffice.org/37496
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 2b9663a7cc93..4f1a89dffa83 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/about \
cui/source/dialogs/colorpicker \
cui/source/dialogs/cuicharmap \
+cui/source/dialogs/charwin \
cui/source/dialogs/cuifmsearch \
cui/source/dialogs/cuigaldlg \
cui/source/dialogs/cuigrfflt \
diff --git a/cui/source/dialogs/charwin.cxx b/cui/source/dialogs/charwin.cxx
new file mode 100644
index ..5f9a7fa49765
--- /dev/null
+++ b/cui/source/dialogs/charwin.cxx
@@ -0,0 +1,213 @@
+/* -*- 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 .
+ */
+
+#include
+#include
+#include "charwin.hxx"
+#include
+#include
+#include
+#include "cuicharmap.hxx"
+#include "macroass.hxx"
+
+using namespace com::sun::star;
+
+
+SvxCharView::SvxCharView(vcl::Window* pParent)
+: Control(pParent, WB_TABSTOP | WB_BORDER)
+, mnY(0)
+{
+}
+
+VCL_BUILDER_FACTORY(SvxCharView)
+
+void SvxCharView::MouseButtonDown( const MouseEvent& rMEvt )
+{
+if ( rMEvt.IsLeft() )
+{
+maMouseClickHdl.Call(this);
+if ( !(rMEvt.GetClicks() % 2) )
+{
+InsertCharToDoc();
+}
+}
+
+Control::MouseButtonDown(rMEvt);
+}
+
+void SvxCharView::KeyInput( const KeyEvent& rKEvt )
+{
+vcl::KeyCode aCode = rKEvt.GetKeyCode();
+
+switch (aCode.GetCode())
+{
+case KEY_SPACE:
+case KEY_RETURN:
+InsertCharToDoc();
+break;
+}
+Control::KeyInput(rKEvt);
+}
+
+void SvxCharView::InsertCharToDoc()
+{
+if(GetText().isEmpty())
+return;
+
+uno::Reference< uno::XComponentContext > xContext(
comphelper::getProcessComponentContext() );
+
+uno::Sequence aArgs(2);
+aArgs[0].Name = OUString::fromUtf8("Symbols");
+aArgs[0].Value <<= GetText();
+
+aArgs[1].Name = OUString::fromUtf8("FontName");
+aArgs[1].Value <<= maFont.GetFamilyName();
+
+comphelper::dispatchCommand(".uno:InsertSymbol", aArgs);
+}
+
+void SvxCharView::Paint(vcl::RenderContext& rRenderContext, const
::tools::Rectangle&)
+{
+rRenderContext.SetFont(maFont);
+
+const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
+const Color aWindowTextColor(rStyleSettings.GetFieldTextColor());
+Color aHighlightColor(rStyleSettings.GetHighlightColor());
+Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor());
+Color aLightColor(rStyleSettings.GetLightColor());
+
+const OUString aText = GetText();
+const Size aSize(GetOutputSizePixel());
+
+long nAvailWidth = aSize.Width();
+long nWinHeight = GetOutputSizePixel().Height();
+
+bool bGotBoundary = true;
+bool bShrankFont = false;
+vcl::Font aOrigFont(rRenderContext.GetFont());
+Size aFontSize(aOrigFont.GetFontSize());
+::tools::Rectangle aBoundRect;
+
+for (long nFontHeight = aFontSize.Height(); nFontHeight > 0; nFontHeight
-= 1)
+{
+
[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source cui/uiconfig extras/source
cui/Library_cui.mk |1
cui/source/customize/cfgutil.cxx | 586 +
cui/source/customize/eventdlg.cxx |2
cui/source/customize/macropg.cxx |2
cui/source/customize/selector.cxx | 1061 -
cui/source/dialogs/scriptdlg.cxx |2
cui/source/factory/cuiexp.cxx |2
cui/source/factory/dlgfact.cxx |2
cui/source/inc/cfg.hxx |2
cui/source/inc/cfgutil.hxx | 58 +
cui/source/inc/selector.hxx| 222 -
cui/uiconfig/ui/macroselectordialog.ui |8
extras/source/glade/libreoffice-catalog.xml.in |6
13 files changed, 461 insertions(+), 1493 deletions(-)
New commits:
commit e4d7511d7e49af14e3c8113bb1440e0eb04f40ad
Author: Maxim Monastirsky
Date: Tue May 9 09:30:54 2017 +0300
tdf#106681 Styles category for the Add Commands dialog
Change-Id: I7332967863697d3ad68a533b9fc603de2fdc87ef
Reviewed-on: https://gerrit.libreoffice.org/37422
Reviewed-by: Maxim Monastirsky
Tested-by: Maxim Monastirsky
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 813bff0eba0c..7eb55fb05375 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -89,7 +89,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/customize/cfgutil \
cui/source/customize/eventdlg \
cui/source/customize/macropg \
-cui/source/customize/selector \
cui/source/dialogs/about \
cui/source/dialogs/colorpicker \
cui/source/dialogs/cuicharmap \
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 8ca7a614b315..c6e310e6505c 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -18,6 +18,7 @@
*/
#include "cfgutil.hxx"
+#include "cfg.hxx"
#include
#include
@@ -26,7 +27,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -60,6 +60,11 @@
#include "dialmgr.hxx"
#include
#include
+#include
+#include
+#include
+#include
+#include
#include
using namespace ::com::sun::star;
@@ -308,6 +313,27 @@ OUString SfxConfigFunctionListBox::GetSelectedScriptURI()
return OUString();
}
+OUString SfxConfigFunctionListBox::GetHelpText()
+{
+SvTreeListEntry *pEntry = FirstSelected();
+if ( pEntry )
+{
+SfxGroupInfo_Impl *pData =
static_cast(pEntry->GetUserData());
+if ( pData )
+{
+if ( pData->nKind == SfxCfgKind::FUNCTION_SLOT )
+{
+return Application::GetHelp()->GetHelpText( pData->sCommand,
this );
+}
+else if ( pData->nKind == SfxCfgKind::FUNCTION_SCRIPT )
+{
+return pData->sHelpText;
+}
+}
+}
+return OUString();
+}
+
OUString SfxConfigFunctionListBox::GetCurCommand()
{
SvTreeListEntry *pEntry = FirstSelected();
@@ -371,7 +397,10 @@
SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
SfxConfigGroupListBox::SfxConfigGroupListBox(vcl::Window* pParent, WinBits
nStyle)
: SvTreeListBox(pParent, nStyle)
-, xImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(nullptr),
pStylesInfo(nullptr)
+, xImp(new SvxConfigGroupBoxResource_Impl())
+, pFunctionListBox(nullptr)
+, m_pImageProvider(nullptr)
+, pStylesInfo(nullptr)
{
SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS |
WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
SetNodeBitmaps(xImp->m_collapsedImage, xImp->m_expandedImage);
@@ -426,6 +455,14 @@ void SfxConfigGroupListBox::InitModule()
sal_Int32 c1 = lGroups.getLength();
sal_Int32 i1 = 0;
+if ( c1 )
+{
+// Add All Commands category
+SvTreeListEntry* pEntry = InsertEntry(
CUI_RES(RID_SVXSTR_ALLFUNCTIONS) );
+aArr.push_back( o3tl::make_unique(
SfxCfgKind::GROUP_ALLFUNCTIONS, 0 ) );
+pEntry->SetUserData(aArr.back().get());
+}
+
for (i1=0; i1SetUserData(pInfo);
+aArr.push_back( o3tl::make_unique(
SfxCfgKind::GROUP_FUNCTION, rGroupID ) );
+pEntry->SetUserData(aArr.back().get());
}
}
catch(const css::uno::RuntimeException&)
@@ -506,6 +543,131 @@ namespace
}
+void SfxConfigGroupListBox::FillScriptList(const css::uno::Reference<
css::script::browse::XBrowseNode >& xRootNode,
+ SvTreeListEntry* pParentEntry, bool
bCheapChildrenOnDemand)
+{
+try {
+if ( xRootNode->hasChildNodes() )
+{
+Sequence< Reference< browse::XBrowseNode > > children =
+xRootNode->getChildNodes();
+bool bIsRootNode = false;
+
+OUString user("user");
+OUString sha
