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

2023-08-27 Thread Tomaž Vajngerl (via logerrit) 
 sd/Library_sd.mk |1 
 sd/source/core/ThemeColorChanger.cxx |   19 ++--
 sd/source/ui/dlg/UndoThemeChange.cxx |   55 +++
 sd/source/ui/inc/UndoThemeChange.hxx |   39 
 4 files changed, 111 insertions(+), 3 deletions(-)

New commits:
commit d3b06d044fafec0b31ada9ecbaf60f396555fb12
Author: Tomaž Vajngerl 
AuthorDate: Sun Aug 27 22:34:13 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Aug 28 07:08:46 2023 +0200

sd: add undo/redo action for changing the model::ColorSet

And add the undo action when changing the theme colors in the
ThemeColorChanger.

Change-Id: Ibeee8aeff420b42fd961e0abd630569e74075585
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156178
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 62a1579dc6aa..3d20e14f0ddd 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -249,6 +249,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/dlg/sdtreelb \
sd/source/ui/dlg/titledockwin \
sd/source/ui/dlg/unchss \
+   sd/source/ui/dlg/UndoThemeChange \
sd/source/ui/docshell/docshel2 \
sd/source/ui/docshell/docshel3 \
sd/source/ui/docshell/docshel4 \
diff --git a/sd/source/core/ThemeColorChanger.cxx 
b/sd/source/core/ThemeColorChanger.cxx
index 020bc1455f6c..adfacb6a47ac 100644
--- a/sd/source/core/ThemeColorChanger.cxx
+++ b/sd/source/core/ThemeColorChanger.cxx
@@ -24,6 +24,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace css;
 
@@ -39,7 +41,8 @@ ThemeColorChanger::~ThemeColorChanger() = default;
 
 namespace
 {
-void changeTheTheme(SdrPage* pMasterPage, std::shared_ptr 
const& pColorSet)
+void changeThemeColors(sd::DrawDocShell* pDocShell, SdrPage* pMasterPage,
+   std::shared_ptr const& pNewColorSet)
 {
 auto pTheme = pMasterPage->getSdrPageProperties().getTheme();
 if (!pTheme)
@@ -47,7 +50,17 @@ void changeTheTheme(SdrPage* pMasterPage, 
std::shared_ptr const
 pTheme = std::make_shared("Office");
 pMasterPage->getSdrPageProperties().setTheme(pTheme);
 }
-pTheme->setColorSet(pColorSet);
+
+std::shared_ptr const& pOldColorSet = 
pTheme->getColorSet();
+
+auto* pUndoManager = pDocShell->GetUndoManager();
+if (pUndoManager)
+{
+pUndoManager->AddUndoAction(std::make_unique(
+pDocShell->GetDoc(), pMasterPage, pOldColorSet, pNewColorSet));
+}
+
+pTheme->setColorSet(pNewColorSet);
 }
 
 bool changeStyle(sd::DrawDocShell* pDocShell, SdStyleSheet* pStyle,
@@ -164,7 +177,7 @@ void 
ThemeColorChanger::apply(std::shared_ptr const& pColorSet)
 }
 }
 
-changeTheTheme(mpMasterPage, pColorSet);
+changeThemeColors(mpDocShell, mpMasterPage, pColorSet);
 
 pUndoManager->LeaveListAction();
 }
diff --git a/sd/source/ui/dlg/UndoThemeChange.cxx 
b/sd/source/ui/dlg/UndoThemeChange.cxx
new file mode 100644
index ..1270dc06cab7
--- /dev/null
+++ b/sd/source/ui/dlg/UndoThemeChange.cxx
@@ -0,0 +1,55 @@
+/* -*- 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/.
+ */
+
+#include 
+#include 
+#include 
+
+namespace sd
+{
+UndoThemeChange::UndoThemeChange(SdDrawDocument* pDocument, SdrPage* 
pMasterPage,
+ std::shared_ptr const& 
pOldColorSet,
+ std::shared_ptr const& 
pNewColorSet)
+: SdUndoAction(pDocument)
+, mpMasterPage(pMasterPage)
+, mpOldColorSet(pOldColorSet)
+, mpNewColorSet(pNewColorSet)
+{
+SetComment(SvxResId(RID_SVXSTR_UNDO_THEME_COLOR_CHANGE));
+}
+
+namespace
+{
+std::shared_ptr getTheme(SdrPage* pMasterPage)
+{
+auto pTheme = pMasterPage->getSdrPageProperties().getTheme();
+if (!pTheme)
+{
+pTheme = std::make_shared("Office");
+pMasterPage->getSdrPageProperties().setTheme(pTheme);
+}
+return pTheme;
+}
+}
+
+void UndoThemeChange::Undo()
+{
+auto pTheme = getTheme(mpMasterPage);
+pTheme->setColorSet(mpOldColorSet);
+}
+
+void UndoThemeChange::Redo()
+{
+auto pTheme = getTheme(mpMasterPage);
+pTheme->setColorSet(mpNewColorSet);
+}
+
+} // end sd namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/UndoThemeChange.hxx 
b/sd/source/ui/inc/UndoThemeChange.hxx
new file mode 100644
index ..798f2adb50bf
--- /dev/null
+++ b/sd/source/ui/inc/UndoThemeChange.hxx
@@ -0,0 +1,39 @@
+/* -*- 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

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

2023-01-28 Thread Mark Hung (via logerrit) 
 sd/Library_sd.mk  |1 
 sd/source/filter/eppt/pptx-animations-nodectx.cxx |  188 ++
 sd/source/filter/eppt/pptx-animations-nodectx.hxx |   59 ++
 sd/source/filter/eppt/pptx-animations.cxx |  184 -
 4 files changed, 250 insertions(+), 182 deletions(-)

New commits:
commit 55d4dc3a6b955e54ee73bc81807552a3b4d4a279
Author: Mark Hung 
AuthorDate: Fri Jan 27 23:34:49 2023 +0800
Commit: Noel Grandin 
CommitDate: Sat Jan 28 18:57:59 2023 +

sd/pptx-anmiations refactor NodeContext.

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

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 297c2bc23654..4ffb86b7d461 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -188,6 +188,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 sd/source/filter/eppt/pptx-epptooxml \
 sd/source/filter/eppt/pptx-animations \
 sd/source/filter/eppt/pptx-animations-cond \
+sd/source/filter/eppt/pptx-animations-nodectx \
 sd/source/filter/eppt/pptx-grouptable \
 sd/source/filter/eppt/pptx-stylesheet \
 sd/source/filter/eppt/pptx-text \
diff --git a/sd/source/filter/eppt/pptx-animations-nodectx.cxx 
b/sd/source/filter/eppt/pptx-animations-nodectx.cxx
new file mode 100644
index ..0d5cabd49343
--- /dev/null
+++ b/sd/source/filter/eppt/pptx-animations-nodectx.cxx
@@ -0,0 +1,188 @@
+/* -*- 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/.
+ */
+
+#include "pptx-animations-nodectx.hxx"
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+using ::com::sun::star::beans::NamedValue;
+using ::com::sun::star::beans::XPropertySet;
+using ::com::sun::star::drawing::XShape;
+
+using namespace ::com::sun::star::animations;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::presentation;
+using namespace ::com::sun::star::uno;
+
+namespace oox::core
+{
+namespace
+{
+bool isValidTarget(const Any& rTarget)
+{
+Reference xShape;
+
+if ((rTarget >>= xShape) && xShape.is())
+return true;
+
+ParagraphTarget aParagraphTarget;
+
+return (rTarget >>= aParagraphTarget) && aParagraphTarget.Shape.is();
+}
+
+bool IsAudioURL(const OUString& rURL)
+{
+return rURL.endsWithIgnoreAsciiCase(".wav") || 
rURL.endsWithIgnoreAsciiCase(".m4a");
+}
+
+/// Returns if rURL has an extension which is a video format.
+bool IsVideoURL(const OUString& rURL) { return 
rURL.endsWithIgnoreAsciiCase(".mp4"); }
+}
+
+NodeContext::NodeContext(const Reference& xNode, bool 
bMainSeqChild,
+ bool bIsIterateChild)
+: mxNode(xNode)
+, mbMainSeqChild(bMainSeqChild)
+, mbValid(true)
+, mnEffectNodeType(-1)
+, mnEffectPresetClass(css::presentation::EffectPresetClass::CUSTOM)
+{
+assert(xNode.is());
+
+initUserData();
+
+initValid(initChildNodes(), bIsIterateChild);
+}
+
+void NodeContext::initUserData()
+{
+assert(mxNode.is());
+
+Sequence aUserData = mxNode->getUserData();
+for (const NamedValue& rProp : aUserData)
+{
+if (rProp.Name == "node-type")
+{
+rProp.Value >>= mnEffectNodeType;
+}
+else if (rProp.Name == "preset-class")
+{
+rProp.Value >>= mnEffectPresetClass;
+}
+else if (rProp.Name == "preset-id")
+{
+rProp.Value >>= msEffectPresetId;
+}
+else if (rProp.Name == "preset-sub-type")
+{
+rProp.Value >>= msEffectPresetSubType;
+}
+}
+}
+
+void NodeContext::initValid(bool bHasValidChild, bool bIsIterateChild)
+{
+sal_Int16 nType = mxNode->getType();
+
+if (nType == AnimationNodeType::ITERATE)
+{
+Reference xIterate(mxNode, UNO_QUERY);
+mbValid = xIterate.is() && (bIsIterateChild || 
isValidTarget(xIterate->getTarget()))
+  && !maChildNodes.empty();
+}
+else if (nType == AnimationNodeType::COMMAND)
+{
+Reference xCommand(mxNode, UNO_QUERY);
+mbValid = xCommand.is() && (bIsIterateChild || 
isValidTarget(xCommand->getTarget()));
+}
+else if (nType == AnimationNodeType::PAR || nType == 
AnimationNodeType::SEQ)
+{
+mbValid = bHasValidChild;
+}
+else if (nType == AnimationNodeType::AUDIO)
+{
+Reference xAudio(mxNode, UNO_QUERY);
+OUString sURL;
+Reference xShape;
+mbValid = false;
+

[Libreoffice-commits] core.git: sd/Library_sd.mk sd/source solenv/clang-format

2021-03-04 Thread Caolán McNamara (via logerrit) 
 sd/Library_sd.mk   |1 
 sd/source/ui/sidebar/PanelBase.cxx |   85 -
 sd/source/ui/sidebar/PanelBase.hxx |   69 --
 solenv/clang-format/excludelist|2 
 4 files changed, 157 deletions(-)

New commits:
commit 9b0bc61f4bcba6d5716e9c3717cda5c682cf5965
Author: Caolán McNamara 
AuthorDate: Thu Mar 4 16:11:26 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 4 20:58:12 2021 +0100

drop newly unused PanelBase

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

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index be4d3e77ffac..fe2dfc3d7617 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -335,7 +335,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/sidebar/MasterPageObserver \
sd/source/ui/sidebar/MasterPagesSelector \
sd/source/ui/sidebar/NavigatorWrapper \
-   sd/source/ui/sidebar/PanelBase \
sd/source/ui/sidebar/PanelFactory \
sd/source/ui/sidebar/PreviewValueSet \
sd/source/ui/sidebar/RecentlyUsedMasterPages \
diff --git a/sd/source/ui/sidebar/PanelBase.cxx 
b/sd/source/ui/sidebar/PanelBase.cxx
deleted file mode 100644
index 70a20ea4e017..
--- a/sd/source/ui/sidebar/PanelBase.cxx
+++ /dev/null
@@ -1,85 +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 "PanelBase.hxx"
-
-namespace sd::sidebar {
-
-PanelBase::PanelBase (
-vcl::Window* pParentWindow,
-ViewShellBase& rViewShellBase)
-: Control(pParentWindow),
-  mpWrappedControl(nullptr),
-  mrViewShellBase(rViewShellBase)
-{
-#ifdef DEBUG
-SetText(OUString("sd:PanelBase"));
-#endif
-}
-
-PanelBase::~PanelBase()
-{
-disposeOnce();
-}
-
-void PanelBase::dispose()
-{
-mpWrappedControl.disposeAndClear();
-Control::dispose();
-}
-
-css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/)
-{
-sal_Int32 nHeight (0);
-if (ProvideWrappedControl())
-nHeight = mpWrappedControl->GetSizePixel().Height();
-return css::ui::LayoutSize(nHeight,nHeight,nHeight);
-}
-
-void PanelBase::Resize()
-{
-if (ProvideWrappedControl())
-{
-Size aNewSize (GetSizePixel());
-mpWrappedControl->SetOutputSizePixel(aNewSize);
-}
-}
-
-bool PanelBase::ProvideWrappedControl()
-{
-if ( ! mpWrappedControl)
-{
-mpWrappedControl.reset(CreateWrappedControl(this, mrViewShellBase));
-if (mpWrappedControl)
-mpWrappedControl->Show();
-}
-return bool(mpWrappedControl);
-}
-
-ISidebarReceiver::~ISidebarReceiver()
-{
-}
-
-IDisposable::~IDisposable()
-{
-}
-
-} // end of namespace sd::sidebar
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/PanelBase.hxx 
b/sd/source/ui/sidebar/PanelBase.hxx
deleted file mode 100644
index 835dc74bda4d..
--- a/sd/source/ui/sidebar/PanelBase.hxx
+++ /dev/null
@@ -1,69 +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 INCLUDED_SD_SOURCE_UI_SIDEBAR_PANELBASE_HXX
-#define INCLUDED_SD_SOURCE_UI_SIDEBAR_PANELBASE_HXX
-

[Libreoffice-commits] core.git: sd/Library_sd.mk sd/source solenv/clang-format

2021-03-04 Thread Caolán McNamara (via logerrit) 
 sd/Library_sd.mk|1 
 sd/source/ui/inc/TableDesignPane.hxx|7 +++
 sd/source/ui/inc/createtabledesignpanel.hxx |   40 ---
 sd/source/ui/sidebar/PanelFactory.cxx   |4 -
 sd/source/ui/sidebar/TableDesignPanel.cxx   |   57 
 sd/source/ui/sidebar/TableDesignPanel.hxx   |   48 ---
 sd/source/ui/table/TableDesignPane.cxx  |   16 ---
 solenv/clang-format/excludelist |4 -
 8 files changed, 11 insertions(+), 166 deletions(-)

New commits:
commit b4993358c89f4c43fe65aeeb2a8adff4d1e04fed
Author: Caolán McNamara 
AuthorDate: Thu Mar 4 16:01:36 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 4 20:57:38 2021 +0100

remove intermediate TableDesignPanel

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

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index b4a029c81920..be4d3e77ffac 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -341,7 +341,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/sidebar/RecentlyUsedMasterPages \
sd/source/ui/sidebar/RecentMasterPagesSelector \
sd/source/ui/sidebar/SlideBackground \
-   sd/source/ui/sidebar/TableDesignPanel \
sd/source/ui/slideshow/PaneHider \
sd/source/ui/slideshow/SlideShowRestarter \
sd/source/ui/slideshow/showwin \
diff --git a/sd/source/ui/table/TableDesignPane.hxx 
b/sd/source/ui/inc/TableDesignPane.hxx
similarity index 91%
rename from sd/source/ui/table/TableDesignPane.hxx
rename to sd/source/ui/inc/TableDesignPane.hxx
index d03a3260303a..69a8c6142907 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/inc/TableDesignPane.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SD_SOURCE_UI_TABLE_TABLEDESIGNPANE_HXX
 
 #include 
+#include 
 #include 
 #include 
 
@@ -102,6 +103,7 @@ private:
 };
 
 class TableDesignPane : public PanelLayout
+  , public sfx2::sidebar::ILayoutableWindow
 {
 private:
 std::unique_ptr m_xImpl;
@@ -113,6 +115,11 @@ public:
 {
 m_pInitialFocusWidget = m_xImpl->GetInitialFocusWidget();
 }
+virtual css::ui::LayoutSize GetHeightForWidth(const sal_Int32 /*nWidth*/) 
override
+{
+sal_Int32 nMinimumHeight = get_preferred_size().Height();
+return css::ui::LayoutSize(nMinimumHeight, -1, nMinimumHeight);
+}
 virtual void dispose() override
 {
 m_xImpl.reset();
diff --git a/sd/source/ui/inc/createtabledesignpanel.hxx 
b/sd/source/ui/inc/createtabledesignpanel.hxx
deleted file mode 100644
index 2ed8ec9672e1..
--- a/sd/source/ui/inc/createtabledesignpanel.hxx
+++ /dev/null
@@ -1,40 +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 INCLUDED_SD_SOURCE_UI_INC_CREATETABLEDESIGNPANEL_HXX
-#define INCLUDED_SD_SOURCE_UI_INC_CREATETABLEDESIGNPANEL_HXX
-
-#include 
-#include 
-
-namespace vcl
-{
-class Window;
-}
-
-class ViewShellBase;
-
-namespace sd
-{
-VclPtr createTableDesignPanel(vcl::Window* pParent, 
ViewShellBase& rBase);
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx 
b/sd/source/ui/sidebar/PanelFactory.cxx
index baa2938320ad..4fd154ef974f 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -28,7 +28,7 @@
 #include 
 #include "NavigatorWrapper.hxx"
 #include 
-#include "TableDesignPanel.hxx"
+#include 
 #include "SlideBackground.hxx"
 
 #include 
@@ -113,7 +113,7 @@ Reference SAL_CALL 
PanelFactory::createUIElement (
 else if (rsUIElementResourceURL.endsWith("/SlideTransitions"))
 pControl = VclPtr::Create(pParentWindow, *pBase, 
xFrame);
 else if (rsUIElementResourceURL.endsWith("/TableDesign"))
-pControl = VclPtr::Create(pParentWindow, *pBase);
+pControl = VclPtr::Create(pParentWindow, *pBase);
 else if (rsUIElementResourceURL.endsWith("/NavigatorPanel"))

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

2017-11-15 Thread Caolán McNamara 
 sd/Library_sd.mk  |1 
 sd/source/ui/framework/module/ImpressModule.cxx   |1 
 sd/source/ui/framework/module/ToolPanelModule.cxx |   88 --
 sd/source/ui/framework/module/ToolPanelModule.hxx |   52 -
 4 files changed, 142 deletions(-)

New commits:
commit 83111eda2e441f288201aac5cc21cf179744947f
Author: Caolán McNamara 
Date:   Wed Nov 15 15:32:20 2017 +

remove now unused ToolPanelModule

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

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index ecaf83587f26..ae4592e340f3 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -250,7 +250,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/framework/module/ShellStackGuard \
sd/source/ui/framework/module/SlideSorterModule \
sd/source/ui/framework/module/ToolBarModule \
-   sd/source/ui/framework/module/ToolPanelModule \
sd/source/ui/framework/module/ViewTabBarModule \
sd/source/ui/framework/tools/FrameworkHelper \
sd/source/ui/func/bulmaper \
diff --git a/sd/source/ui/framework/module/ImpressModule.cxx 
b/sd/source/ui/framework/module/ImpressModule.cxx
index bf2ee2472c93..3b62e17ae380 100644
--- a/sd/source/ui/framework/module/ImpressModule.cxx
+++ b/sd/source/ui/framework/module/ImpressModule.cxx
@@ -23,7 +23,6 @@
 #include "ViewTabBarModule.hxx"
 #include "CenterViewFocusModule.hxx"
 #include "SlideSorterModule.hxx"
-#include "ToolPanelModule.hxx"
 #include "ToolBarModule.hxx"
 #include "ShellStackGuard.hxx"
 
diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx 
b/sd/source/ui/framework/module/ToolPanelModule.cxx
deleted file mode 100644
index ab8d6fc25430..
--- a/sd/source/ui/framework/module/ToolPanelModule.cxx
+++ /dev/null
@@ -1,88 +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 "ToolPanelModule.hxx"
-
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
-
-using ::sd::framework::FrameworkHelper;
-
-namespace sd { namespace framework {
-
-//= ToolPanelModule ==
-
-ToolPanelModule::ToolPanelModule (
-const Reference& rxController,
-const OUString& rsSidebarPaneURL)
-: ResourceManager(rxController,
-FrameworkHelper::CreateResourceId(FrameworkHelper::msSidebarViewURL, 
rsSidebarPaneURL))
-{
-if (mxConfigurationController.is())
-{
-if (SvtToolPanelOptions().GetVisibleImpressView())
-AddActiveMainView(FrameworkHelper::msImpressViewURL);
-if (SvtToolPanelOptions().GetVisibleOutlineView())
-AddActiveMainView(FrameworkHelper::msOutlineViewURL);
-if (SvtToolPanelOptions().GetVisibleNotesView())
-AddActiveMainView(FrameworkHelper::msNotesViewURL);
-if (SvtToolPanelOptions().GetVisibleHandoutView())
-AddActiveMainView(FrameworkHelper::msHandoutViewURL);
-if (SvtToolPanelOptions().GetVisibleSlideSorterView())
-AddActiveMainView(FrameworkHelper::msSlideSorterURL);
-
-mxConfigurationController->addConfigurationChangeListener(
-this,
-FrameworkHelper::msResourceActivationEvent,
-Any());
-}
-}
-
-ToolPanelModule::~ToolPanelModule()
-{
-}
-
-void ToolPanelModule::SaveResourceState()
-{
-
SvtToolPanelOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL));
-
SvtToolPanelOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL));
-
SvtToolPanelOptions().SetVisibleNotesView(IsResourceActive(FrameworkHelper::msNotesViewURL));
-

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

2017-06-21 Thread Takeshi Abe 
 sd/Library_sd.mk  |1 -
 sd/source/core/sdattr.cxx |   20 
 2 files changed, 21 deletions(-)

New commits:
commit d3c70b5f704f20e15611a8bf0d162a3c637400b6
Author: Takeshi Abe 
Date:   Wed Jun 21 20:59:55 2017 +0900

sd: Kill empty sdattr.cxx

Change-Id: I9343616352489205d606043fb773185f3784a8d9
Reviewed-on: https://gerrit.libreoffice.org/39051
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 62a4c3775e47..683da42a92e6 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -134,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/core/drawdoc4 \
sd/source/core/drawdoc_animations \
sd/source/core/pglink \
-   sd/source/core/sdattr \
sd/source/core/sdiocmpt \
sd/source/core/sdobjfac \
sd/source/core/sdpage \
diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx
deleted file mode 100644
index 52597c57ca92..
--- a/sd/source/core/sdattr.cxx
+++ /dev/null
@@ -1,20 +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 .
- */
-
-/* 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: sd/Library_sd.mk sd/source

2016-12-13 Thread Takeshi Abe 
 sd/Library_sd.mk |1 -
 sd/source/ui/func/sdundo.cxx |   23 ---
 2 files changed, 24 deletions(-)

New commits:
commit dda4e607689dbe76163b34830ab49513864e14da
Author: Takeshi Abe 
Date:   Wed Dec 14 05:31:25 2016 +0900

sd: Remove empty file

Change-Id: I2139e2ed35d4ecdeb94ff6673e12dd58986d0344
Reviewed-on: https://gerrit.libreoffice.org/31975
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 337cb61..7b3beea2 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -307,7 +307,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/func/futxtatt \
sd/source/ui/func/fuvect \
sd/source/ui/func/fuzoom \
-   sd/source/ui/func/sdundo \
sd/source/ui/func/sdundogr \
sd/source/ui/func/smarttag \
sd/source/ui/func/undoback \
diff --git a/sd/source/ui/func/sdundo.cxx b/sd/source/ui/func/sdundo.cxx
deleted file mode 100644
index 19ec5a7..000
--- a/sd/source/ui/func/sdundo.cxx
+++ /dev/null
@@ -1,23 +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 "sdundo.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: sd/Library_sd.mk sd/source sd/uiconfig sd/UIConfig_simpress.mk

2016-06-28 Thread Szymon Kłos 
 sd/Library_sd.mk   |1 
 sd/UIConfig_simpress.mk|1 
 sd/source/ui/animations/CustomAnimationBox.cxx |   81 ++
 sd/source/ui/animations/CustomAnimationPane.cxx|   60 +
 sd/source/ui/animations/CustomAnimationPane.hxx|4 
 sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui |  409 +
 sd/uiconfig/simpress/ui/notebookbar.ui |   34 -
 7 files changed, 569 insertions(+), 21 deletions(-)

New commits:
commit 6af8c9ef2de39b933274c96fd661d219b2bed8a3
Author: Szymon Kłos 
Date:   Tue Jun 28 16:09:16 2016 +0200

GSoC notebookbar: added animation tab for Impress

Change-Id: Iff9d0269f0f8ce0e0a311c1bbcaf5f749c305348
Reviewed-on: https://gerrit.libreoffice.org/26744
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index eab6571..72ea43e 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -175,6 +175,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/accessibility/AccessibleViewForwarder \
sd/source/ui/accessibility/SdShapeTypes \
 sd/source/ui/animations/CategoryListBox \
+   sd/source/ui/animations/CustomAnimationBox \
sd/source/ui/animations/CustomAnimationDialog \
sd/source/ui/animations/CustomAnimationList \
sd/source/ui/animations/CustomAnimationPane \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index ef79c95..a5351dc 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -104,6 +104,7 @@ $(eval $(call 
gb_UIConfig_add_toolbarfiles,modules/simpress,\
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/customanimationspanel \
+   sd/uiconfig/simpress/ui/customanimationspanelhorizontal \
sd/uiconfig/simpress/ui/customanimationproperties \
sd/uiconfig/simpress/ui/customanimationeffecttab \
sd/uiconfig/simpress/ui/customanimationtimingtab \
diff --git a/sd/source/ui/animations/CustomAnimationBox.cxx 
b/sd/source/ui/animations/CustomAnimationBox.cxx
new file mode 100644
index 000..d37de23
--- /dev/null
+++ b/sd/source/ui/animations/CustomAnimationBox.cxx
@@ -0,0 +1,81 @@
+/* -*- 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 "ViewShellBase.hxx"
+#include 
+#include "CustomAnimationPane.hxx"
+#include 
+#include 
+
+namespace sd
+{
+
+class CustomAnimationBox : public VclVBox
+{
+VclPtr m_pPane;
+bool m_bIsInitialized;
+
+public:
+CustomAnimationBox(vcl::Window* pParent);
+~CustomAnimationBox() override;
+
+virtual void dispose() override;
+virtual void StateChanged(StateChangedType nStateChange) override;
+};
+
+VCL_BUILDER_FACTORY(CustomAnimationBox);
+
+CustomAnimationBox::CustomAnimationBox(vcl::Window* pParent)
+: VclVBox(pParent)
+, m_bIsInitialized(false)
+{
+}
+
+CustomAnimationBox::~CustomAnimationBox()
+{
+disposeOnce();
+}
+
+void CustomAnimationBox::dispose()
+{
+m_pPane.disposeAndClear();
+VclVBox::dispose();
+}
+
+void CustomAnimationBox::StateChanged(StateChangedType nStateChange)
+{
+if(SfxViewFrame::Current() && !m_bIsInitialized)
+{
+ViewShellBase* pBase = 
ViewShellBase::GetViewShellBase(SfxViewFrame::Current());
+
+if(pBase && pBase->GetDocShell())
+{
+css::uno::Reference xFrame;
+m_pPane = VclPtr::Create(this, *pBase, 
xFrame, true);
+m_pPane->Show();
+m_pPane->SetSizePixel(GetSizePixel());
+m_bIsInitialized = true;
+}
+}
+VclVBox::StateChanged(nStateChange);
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index e8de52c..e328453 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -133,12 +133,36 @@

[Libreoffice-commits] core.git: sd/Library_sd.mk sd/source sd/uiconfig sd/UIConfig_simpress.mk

2016-02-04 Thread Rishabh Kumar 
 sd/Library_sd.mk   |2 
 sd/UIConfig_simpress.mk|2 
 sd/source/ui/animations/CategoryListBox.cxx|   77 ++
 sd/source/ui/animations/CategoryListBox.hxx|   31 +
 sd/source/ui/animations/CustomAnimationPane.cxx|  499 +++--
 sd/source/ui/animations/CustomAnimationPane.hxx|   23 
 sd/uiconfig/simpress/ui/customanimationcreatedialog.ui |  161 -
 sd/uiconfig/simpress/ui/customanimationcreatetab.ui|   78 --
 sd/uiconfig/simpress/ui/customanimationspanel.ui   |  165 -
 9 files changed, 604 insertions(+), 434 deletions(-)

New commits:
commit e4aa4472f84dc9fcf0acaab80ede005603a4b93c
Author: Rishabh Kumar 
Date:   Thu Jul 16 05:17:52 2015 +0530

tdf#87813: Moving effects list into the animation tab

Adding the animation effect -
1.Press the + button

Modifying the animation effect
1. Select the animation from the list of added animations
2. Select the animation style from the Listbox

Change-Id: I14f9242b9f04279622d879ae8c3e162ded6e3e3d
Reviewed-on: https://gerrit.libreoffice.org/17008
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 66dca43..c54bd6d 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -174,7 +174,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/accessibility/AccessibleSlideSorterView \
sd/source/ui/accessibility/AccessibleViewForwarder \
sd/source/ui/accessibility/SdShapeTypes \
-   sd/source/ui/animations/CustomAnimationCreateDialog \
+sd/source/ui/animations/CategoryListBox \
sd/source/ui/animations/CustomAnimationDialog \
sd/source/ui/animations/CustomAnimationList \
sd/source/ui/animations/CustomAnimationPane \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index d42ef0a..a0d70e9 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -71,8 +71,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/assistentdialog \
-   sd/uiconfig/simpress/ui/customanimationcreatedialog \
-   sd/uiconfig/simpress/ui/customanimationcreatetab \
sd/uiconfig/simpress/ui/customanimationspanel \
sd/uiconfig/simpress/ui/customanimationproperties \
sd/uiconfig/simpress/ui/customanimationeffecttab \
diff --git a/sd/source/ui/animations/CategoryListBox.cxx 
b/sd/source/ui/animations/CategoryListBox.cxx
new file mode 100644
index 000..93364d4
--- /dev/null
+++ b/sd/source/ui/animations/CategoryListBox.cxx
@@ -0,0 +1,77 @@
+#include "CategoryListBox.hxx"
+
+namespace sd {
+
+CategoryListBox::CategoryListBox( vcl::Window* pParent )
+: ListBox( pParent, WB_TABSTOP | WB_BORDER )
+{
+EnableUserDraw( true );
+SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) );
+}
+
+VCL_BUILDER_FACTORY(CategoryListBox)
+
+CategoryListBox::~CategoryListBox()
+{
+}
+
+sal_Int32  CategoryListBox::InsertCategory( const OUString& rStr, sal_Int32  
nPos /* = LISTBOX_APPEND */ )
+{
+sal_Int32  n = ListBox::InsertEntry( rStr, nPos );
+if( n != LISTBOX_ENTRY_NOTFOUND )
+ListBox::SetEntryFlags( n, ListBox::GetEntryFlags(n) | 
ListBoxEntryFlags::DisableSelection );
+
+return n;
+}
+
+void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt )
+{
+const sal_uInt16 nItem = rUDEvt.GetItemId();
+
+if( ListBox::GetEntryFlags(nItem) & ListBoxEntryFlags::DisableSelection )
+{
+Rectangle aOutRect( rUDEvt.GetRect() );
+vcl::RenderContext* pDev = rUDEvt.GetRenderContext();
+
+// fill the background
+Color aColor (GetSettings().GetStyleSettings().GetDialogColor());
+
+pDev->SetFillColor (aColor);
+pDev->SetLineColor ();
+pDev->DrawRect(aOutRect);
+
+// Erase the four corner pixels to make the rectangle appear rounded.
+pDev->SetLineColor( GetSettings().GetStyleSettings().GetWindowColor());
+pDev->DrawPixel( aOutRect.TopLeft());
+pDev->DrawPixel( Point(aOutRect.Right(), aOutRect.Top()));
+pDev->DrawPixel( Point(aOutRect.Left(), aOutRect.Bottom()));
+pDev->DrawPixel( Point(aOutRect.Right(), aOutRect.Bottom()));
+
+// draw the category title
+pDev->DrawText (aOutRect, GetEntry(nItem), DrawTextFlags::Center );
+}
+else
+{
+DrawEntry( rUDEvt, true, true );
+}
+}
+
+IMPL_LINK_NOARG_TYPED(CategoryListBox, implDoubleClickHdl, ListBox&, void)
+{
+CaptureMouse();
+}
+
+void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt )
+{
+ReleaseMouse();
+if( rMEvt.IsLeft() && (rMEvt.GetClicks() == 2) )
+{
+maDoubleClickHdl.Call( *this );
+}
+else
+{
+

[Libreoffice-commits] core.git: sd/Library_sd.mk sd/source svx/Library_svxcore.mk svx/source sw/Library_sw.mk sw/source toolkit/Library_tk.mk toolkit/source vcl/Library_vcl.mk vcl/source vcl/unx

2015-01-08 Thread Matúš Kukan 
 sd/Library_sd.mk  |1 +
 sd/source/ui/dlg/sdabstdlg.cxx|2 +-
 svx/Library_svxcore.mk|1 +
 svx/source/form/dbtoolsclient.cxx |2 +-
 sw/Library_sw.mk  |2 ++
 sw/source/uibase/dbui/swdbtoolsclient.cxx |2 +-
 sw/source/uibase/dialog/swabstdlg.cxx |2 +-
 toolkit/Library_tk.mk |1 +
 toolkit/source/awt/vclxtoolkit.cxx|2 +-
 vcl/Library_vcl.mk|4 
 vcl/source/app/svapp.cxx  |2 +-
 vcl/source/window/abstdlg.cxx |3 +--
 vcl/unx/generic/plugadapt/salplug.cxx |4 ++--
 13 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 5c5edaef89e953d260501678c3d62c47ad9763ac
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 8 21:14:04 2015 +0100

Revert Use SVLIBRARY instead of gb_Library_get_runtime_filename

$(call gb_Library__get_name,foo) returns libmerged if library foo is 
merged.

This reverts commit ee567a63fad9e755b11ca28696da35f00ed3b0fc.

Change-Id: I6ab9b7f0b01262a6f9d5a6834a6cffdd6ffc6f8a

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index a38b6eb..2afcf9b 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_set_include,sd,\
 
 $(eval $(call gb_Library_add_defs,sd,\
-DSD_DLLIMPLEMENTATION \
+   -DSDUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,sdui))\ \
 ))
 
 ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 4594295..acf4705 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -42,7 +42,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
 static ::osl::Module aDialogLibrary;
-static const OUString sLibName(SVLIBRARY(sdui));
+static const OUString sLibName(SDUI_DLL_NAME);
 if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( thisModule, 
sLibName ) )
 fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
 aDialogLibrary.getFunctionSymbol( SdCreateDialogFactory );
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index a1c7696..39d6be5 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -47,6 +47,7 @@ $(eval $(call 
gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/pr
 $(eval $(call gb_Library_add_defs,svxcore,\
 -DSVX_DLLIMPLEMENTATION \
 -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+-DDBTOOLS_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,dbtools))\ \
 ))
 
 $(eval $(call gb_Library_use_libraries,svxcore,\
diff --git a/svx/source/form/dbtoolsclient.cxx 
b/svx/source/form/dbtoolsclient.cxx
index baee838..79e6eab 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -116,7 +116,7 @@ namespace svxform
 
 // load the dbtools library
 s_hDbtoolsModule = osl_loadModuleRelative(
-thisModule, OUString(SVLIBRARY(dbtools)).pData, 0);
+thisModule, OUString(DBTOOLS_DLL_NAME).pData, 0);
 OSL_ENSURE(NULL != s_hDbtoolsModule, 
ODbtoolsClient::registerClient: could not load the dbtools library!);
 if (NULL != s_hDbtoolsModule)
 {
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index a5b853a..2af35f2 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -43,6 +43,8 @@ $(eval $(call gb_Library_use_sdk_api,sw))
 
 $(eval $(call gb_Library_add_defs,sw,\
 -DSW_DLLIMPLEMENTATION \
+   -DSWUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,swui))\ \
+   -DDBTOOLS_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,dbtools))\ \
 ))
 
 $(eval $(call gb_Library_use_libraries,sw,\
diff --git a/sw/source/uibase/dbui/swdbtoolsclient.cxx 
b/sw/source/uibase/dbui/swdbtoolsclient.cxx
index 2c1ce9a..a7bc6d9 100644
--- a/sw/source/uibase/dbui/swdbtoolsclient.cxx
+++ b/sw/source/uibase/dbui/swdbtoolsclient.cxx
@@ -102,7 +102,7 @@ void SwDbtoolsClient::registerClient()
 
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
-const OUString sModuleName(SVLIBRARY(dbtools));
+const OUString sModuleName(DBTOOLS_DLL_NAME);
 
 // load the dbtools library
 getDbToolsClientModule() = osl_loadModuleRelative(
diff --git a/sw/source/uibase/dialog/swabstdlg.cxx 
b/sw/source/uibase/dialog/swabstdlg.cxx
index 127ac29..7b5ec71 100644
--- a/sw/source/uibase/dialog/swabstdlg.cxx
+++ b/sw/source/uibase/dialog/swabstdlg.cxx
@@ -41,7 +41,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
 static ::osl::Module aDialogLibrary;
-static const OUString sLibName(SVLIBRARY(swui));
+static const OUString

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

2013-11-20 Thread Marcos Paulo de Souza 
 sd/Library_sd.mk|2 
 sd/source/ui/app/sddll.cxx  |  235 ++--
 sd/source/ui/app/sddll1.cxx |  119 --
 sd/source/ui/app/sddll2.cxx |  195 
 4 files changed, 229 insertions(+), 322 deletions(-)

New commits:
commit 297e316cac3118b0052aa5a9cdc2008c9aad5549
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Mon Nov 18 19:04:21 2013 -0200

Merge sddll files in sd

Change-Id: I65de77467c929be30d8f38a4d86fa672b397aff6
Reviewed-on: https://gerrit.libreoffice.org/6714
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Thorsten Behrens t...@documentfoundation.org
Tested-by: Thorsten Behrens t...@documentfoundation.org

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 98f1223..f9b69c9 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -180,8 +180,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/annotations/annotationwindow \
sd/source/ui/app/optsitem \
sd/source/ui/app/sddll \
-   sd/source/ui/app/sddll1 \
-   sd/source/ui/app/sddll2 \
sd/source/ui/app/sdmod \
sd/source/ui/app/sdmod1 \
sd/source/ui/app/sdmod2 \
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index a55ea93..f7a27c0 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -17,8 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include avmedia/mediaplayer.hxx
+#include avmedia/mediatoolbox.hxx
 #include editeng/eeitem.hxx
-
 #include editeng/editeng.hxx
 #include svx/svdobj.hxx
 #include unotools/moduleoptions.hxx
@@ -28,30 +29,252 @@
 #include vcl/svapp.hxx
 
 #include sddll.hxx
+#include app.hrc
+#include AnimationChildWindow.hxx
+#include BezierObjectBar.hxx
+#include diactrl.hxx
 #include DrawDocShell.hxx
+#include FactoryIds.hxx
+#include gluectrl.hxx
 #include GraphicDocShell.hxx
+#include GraphicObjectBar.hxx
+#include GraphicViewShell.hxx
+#include GraphicViewShellBase.hxx
+#include ImpressViewShellBase.hxx
+#include PresentationViewShell.hxx
+#include PresentationViewShellBase.hxx
+#include LayerDialogChildWindow.hxx
+#include MediaObjectBar.hxx
+#include NavigatorChildWindow.hxx
+#include OutlineViewShell.hxx
+#include OutlineViewShellBase.hxx
+#include PaneChildWindows.hxx
 #include sdresid.hxx
 #include sdobjfac.hxx
 #include cfgids.hxx
+#include SpellDialogChildWindow.hxx
+#include SlideSorterViewShell.hxx
+#include SlideSorterViewShellBase.hxx
 #include strmname.h
 #include SdShapeTypes.hxx
+#include tbx_ww.hxx
+#include TextObjectBar.hxx
+#include tmplctrl.hxx
 
+#include svx/svxids.hrc
+#include svx/bmpmask.hxx
+#include svx/clipboardctl.hxx
+#include svx/extrusioncolorcontrol.hxx
+#include svx/f3dchild.hxx
+#include svx/fillctrl.hxx
+#include svx/fntctl.hxx
+#include svx/fntszctl.hxx
+#include svx/fontwork.hxx
+#include svx/fontworkgallery.hxx
+#include svx/formatpaintbrushctrl.hxx
+#include svx/galbrws.hxx
+#include svx/grafctrl.hxx
+#include svx/hyperdlg.hxx
+#include svx/imapdlg.hxx
+#include svx/layctrl.hxx
+#include svx/lboxctrl.hxx
+#include svx/linectrl.hxx
+#include svx/modctrl.hxx
+#include svx/pszctrl.hxx
+#include svx/srchdlg.hxx
+#include svx/subtoolboxcontrol.hxx
+#include svx/SvxColorChildWindow.hxx
 #include svx/SvxShapeTypes.hxx
+#include svx/tbcontrl.hxx
+#include svx/tbxcustomshapes.hxx
+#include svx/verttexttbxctrl.hxx
+#include svx/xmlsecctrl.hxx
+#include svx/zoomctrl.hxx
+#include svx/zoomsliderctrl.hxx
 #include sfx2/docfilt.hxx
 #include sfx2/docfile.hxx
 #include sfx2/fcontnr.hxx
+#include sfx2/sidebar/SidebarChildWindow.hxx
 #include vcl/FilterConfigItem.hxx
 #include comphelper/processfactory.hxx
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
+namespace sd { namespace ui { namespace table {
+extern void RegisterInterfaces( SfxModule* pMod );
+} } }
+
+// Register all Factorys
+void SdDLL::RegisterFactorys()
+{
+if (SvtModuleOptions().IsImpress())
+{
+::sd::ImpressViewShellBase::RegisterFactory (
+::sd::IMPRESS_FACTORY_ID);
+::sd::SlideSorterViewShellBase::RegisterFactory (
+::sd::SLIDE_SORTER_FACTORY_ID);
+::sd::OutlineViewShellBase::RegisterFactory (
+::sd::OUTLINE_FACTORY_ID);
+::sd::PresentationViewShellBase::RegisterFactory (
+::sd::PRESENTATION_FACTORY_ID);
+}
+if (SvtModuleOptions().IsDraw())
+{
+::sd::GraphicViewShellBase::RegisterFactory (::sd::DRAW_FACTORY_ID);
+}
+}
+
+// Register all Interfaces
+
+void SdDLL::RegisterInterfaces()
+{
+// Module
+SfxModule* pMod = SD_MOD();
+SdModule::RegisterInterface(pMod);
+
+// View shell base.
+::sd::ViewShellBase::RegisterInterface(pMod);
+
+// DocShells
+::sd::DrawDocShell::RegisterInterface(pMod);
+::sd::GraphicDocShell::RegisterInterface(pMod);
+
+// Impress

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

2013-07-26 Thread Siqi 
 sd/Library_sd.mk   |8 
 sd/source/ui/remotecontrol/AvahiNetworkService.cxx |2 
 sd/source/ui/remotecontrol/avahi-common/thread-watch.c |  191 -
 sd/source/ui/remotecontrol/avahi-common/thread-watch.h |   82 ---
 4 files changed, 1 insertion(+), 282 deletions(-)

New commits:
commit 76aad98dcbe03ceb17fdf975eb4a1281f9814844
Author: Siqi m...@siqi.fr
Date:   Fri Jul 26 13:30:26 2013 +0200

Revert add threaded pool support for avahi backward compatibility

This reverts commit af1ce3de97a6c1d583f82558ee18054b7917b03d.

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 8484423..807926f 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -553,14 +553,6 @@ ifeq ($(ENABLE_AVAHI),TRUE)
 $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/remotecontrol/AvahiNetworkService \
 ))
-
-$(eval $(call gb_Library_add_cobjects,sd,\
-   sd/source/ui/remotecontrol/avahi-common/thread-watch \
-))
-
-$(eval $(call gb_Library_add_libs,sd,\
-   -lpthread \
-))
 endif
 
 $(eval $(call gb_Library_add_exception_objects,sd,\
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx 
b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index 6043d49..5cb52de 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -10,7 +10,7 @@
 #include avahi-common/malloc.h
 #include avahi-common/error.h
 #include avahi-common/timeval.h
-#include avahi-common/thread-watch.h
+#include avahi-common/thread-watch.h
 
 #include AvahiNetworkService.hxx
 #include ZeroconfService.hxx
diff --git a/sd/source/ui/remotecontrol/avahi-common/thread-watch.c 
b/sd/source/ui/remotecontrol/avahi-common/thread-watch.c
deleted file mode 100644
index 4bb277f..000
--- a/sd/source/ui/remotecontrol/avahi-common/thread-watch.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* $Id$ */
-
-/***
-  This file is part of avahi.
-
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2.1 of the
-  License, or (at your option) any later version.
-
-  avahi is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
-  Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include config.h
-#endif
-
-#include sys/poll.h
-#include assert.h
-#include string.h
-#include errno.h
-#include unistd.h
-#include fcntl.h
-#include stdio.h
-#include pthread.h
-#include signal.h
-
-#include avahi-common/llist.h
-#include avahi-common/malloc.h
-#include avahi-common/error.h
-#include avahi-common/timeval.h
-#include avahi-common/simple-watch.h
-
-// Only introduced in 0.6.13. Place it here as advised by avahi maintainer
-#include thread-watch.h
-
-struct AvahiThreadedPoll {
-AvahiSimplePoll *simple_poll;
-pthread_t thread_id;
-pthread_mutex_t mutex;
-int thread_running;
-int retval;
-};
-
-static int poll_func(struct pollfd *ufds, unsigned int nfds, int timeout, void 
*userdata) {
-pthread_mutex_t *mutex = userdata;
-int r;
-
-/* Before entering poll() we unlock the mutex, so that
- * avahi_simple_poll_quit() can succeed from another thread. */
-
-pthread_mutex_unlock(mutex);
-r = poll(ufds, nfds, timeout);
-pthread_mutex_lock(mutex);
-
-return r;
-}
-
-static void* thread(void *userdata){
-AvahiThreadedPoll *p = userdata;
-sigset_t mask;
-
-/* Make sure that signals are delivered to the main thread */
-sigfillset(mask);
-pthread_sigmask(SIG_BLOCK, mask, NULL);
-
-pthread_mutex_lock(p-mutex);
-p-retval = avahi_simple_poll_loop(p-simple_poll);
-pthread_mutex_unlock(p-mutex);
-
-return NULL;
-}
-
-AvahiThreadedPoll *avahi_threaded_poll_new(void) {
-AvahiThreadedPoll *p;
-
-if (!(p = avahi_new(AvahiThreadedPoll, 1)))
-goto fail; /* OOM */
-
-if (!(p-simple_poll = avahi_simple_poll_new()))
-goto fail;
-
-pthread_mutex_init(p-mutex, NULL);
-
-avahi_simple_poll_set_func(p-simple_poll, poll_func, p-mutex);
-
-p-thread_running = 0;
-
-return p;
-
-fail:
-if (p) {
-if (p-simple_poll) {
-avahi_simple_poll_free(p-simple_poll);
-pthread_mutex_destroy(p-mutex);
-}
-
-avahi_free(p);
-}
-
-return NULL;
-}
-
-void avahi_threaded_poll_free(AvahiThreadedPoll *p) {
-assert(p);
-
-/* Make sure that this function is not called from the helper thread */
-assert(!p-thread_running || !pthread_equal(pthread_self(), p-thread_id));
-
-if

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

2013-02-17 Thread Norbert Thiebaud 
 sd/Library_sd.mk   |3 ++-
 sd/source/ui/remotecontrol/OSXBluetooth.mm |7 ---
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit c21916ad8a315a9dd7f23bf9aef0576975470a5a
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun Feb 17 10:08:01 2013 -0600

pragma GCC diagnostic is not available for 4.0.1

Change-Id: I4aa9fb45c391c8b17d713e77a8a6e3338005441b

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 4967845..6a967c5 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -543,7 +543,8 @@ else
 
 $(eval $(call gb_Library_add_objcxxobjects,sd,\
 sd/source/ui/remotecontrol/BluetoothServer \
-sd/source/ui/remotecontrol/OSXBluetooth \
+sd/source/ui/remotecontrol/OSXBluetooth,\
+-Wno-error \
 ))
 
 $(eval $(call gb_Library_add_libs,sd,\
diff --git a/sd/source/ui/remotecontrol/OSXBluetooth.mm 
b/sd/source/ui/remotecontrol/OSXBluetooth.mm
index 1d4a3f0..ef1b700 100644
--- a/sd/source/ui/remotecontrol/OSXBluetooth.mm
+++ b/sd/source/ui/remotecontrol/OSXBluetooth.mm
@@ -6,7 +6,6 @@
  * 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/.
  */
-
 #include osl/conditn.hxx // Include this early to avoid error as check() 
gets defined by some SDK header to empty
 
 #include premac.h
@@ -43,12 +42,6 @@
 pSocket = NULL;
 }
 
-// The Xcode 3 compiler warns if we don't implement all methods of the
-// IOBluetoothRFCOMMChannelDelegate protocol. In later SDKs they are
-// marked as @optional.
-
-#pragma GCC diagnostic ignored -Wprotocol
-
 @end
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits