[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 22 commits - codemaker/source configure.in cppu/source cui/source external_deps.lst officecfg/registry package/source python/makefile.mk python/prj python/python-2.7.3-nohardlink.patch python/python-2.7.3-pcbuild.patch python/python-2.7.3-sysbase.patch python/python-2.7.4-nohardlink.patch python/python-2.7.4-pcbuild.patch python/python-2.7.4-sysbase.patch python/python-freebsd.patch python/python-md5.patch python/python-solaris.patch python/python-ssl.patch python/pyversion.mk sc/source sd/source sfx2/inc sfx2/Package_inc.mk sfx2/source soltools/cpp stlport/makefile.mk stlport/systemstl svtools/inc svtools/source svx/AllLangResTarget_svx.mk svx/inc svx/Library_svx.mk svx/source sw/source vcl/inc xml2cmp/source
Ariel Constenla-Haile
arielch at apache.org
Sat May 4 13:32:58 PDT 2013
codemaker/source/javamaker/classfile.hxx | 3
configure.in | 14
cppu/source/uno/EnvStack.cxx | 4
cui/source/options/optchart.cxx | 7
cui/source/tabpages/tpbitmap.cxx | 32
cui/source/tabpages/tpcolor.cxx | 19
cui/source/tabpages/tpgradnt.cxx | 4
cui/source/tabpages/tphatch.cxx | 4
cui/source/tabpages/tplnedef.cxx | 6
cui/source/tabpages/tplneend.cxx | 11
external_deps.lst | 6
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 23
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 13
package/source/manifest/ManifestImport.cxx | 4
python/makefile.mk | 2
python/prj/d.lst | 108
python/python-2.7.3-nohardlink.patch | 11
python/python-2.7.3-pcbuild.patch | 1778 ----------
python/python-2.7.3-sysbase.patch | 13
python/python-2.7.4-nohardlink.patch | 11
python/python-2.7.4-pcbuild.patch | 1778 ++++++++++
python/python-2.7.4-sysbase.patch | 13
python/python-freebsd.patch | 48
python/python-md5.patch | 6
python/python-solaris.patch | 4
python/python-ssl.patch | 12
python/pyversion.mk | 2
sc/source/ui/view/editsh.cxx | 12
sc/source/ui/view/formatsh.cxx | 16
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/sdview3.cxx | 25
sfx2/Package_inc.mk | 2
sfx2/inc/sfx2/sidebar/CommandInfoProvider.hxx | 98
sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc | 144
sfx2/inc/sfx2/sidebar/Tools.hxx | 72
sfx2/inc/sfx2/sidebar/propertypanel.hrc | 132
sfx2/source/sidebar/CommandInfoProvider.cxx | 2
sfx2/source/sidebar/CommandInfoProvider.hxx | 96
sfx2/source/sidebar/ControllerItem.cxx | 2
sfx2/source/sidebar/CustomImageRadioButton.cxx | 2
sfx2/source/sidebar/Deck.cxx | 2
sfx2/source/sidebar/DeckTitleBar.cxx | 2
sfx2/source/sidebar/FocusManager.cxx | 2
sfx2/source/sidebar/MenuButton.cxx | 2
sfx2/source/sidebar/Paint.cxx | 2
sfx2/source/sidebar/Panel.cxx | 2
sfx2/source/sidebar/PanelTitleBar.cxx | 2
sfx2/source/sidebar/ResourceManager.cxx | 2
sfx2/source/sidebar/SidebarController.cxx | 39
sfx2/source/sidebar/SidebarController.hxx | 2
sfx2/source/sidebar/SidebarToolBox.cxx | 2
sfx2/source/sidebar/TabBar.cxx | 2
sfx2/source/sidebar/TabItem.cxx | 2
sfx2/source/sidebar/Theme.cxx | 2
sfx2/source/sidebar/ToolBoxBackground.cxx | 2
sfx2/source/sidebar/Tools.cxx | 34
sfx2/source/sidebar/Tools.hxx | 63
soltools/cpp/_unix.c | 2
stlport/makefile.mk | 1
stlport/systemstl/rope | 42
svtools/inc/svtools/accessibilityoptions.hxx | 6
svtools/source/config/accessibilityoptions.cxx | 59
svtools/source/inc/configitems/accessibilityoptions_const.hxx | 25
svx/AllLangResTarget_svx.mk | 1
svx/Library_svx.mk | 3
svx/inc/helpid.hrc | 3
svx/inc/svx/dialogs.hrc | 4
svx/inc/svx/dlgctrl.hxx | 28
svx/inc/svx/xtable.hxx | 207 -
svx/source/dialog/dlgctrl.cxx | 142
svx/source/sidebar/PanelFactory.cxx | 5
svx/source/sidebar/insert/InsertPropertyPanel.cxx | 419 ++
svx/source/sidebar/insert/InsertPropertyPanel.hrc | 42
svx/source/sidebar/insert/InsertPropertyPanel.hxx | 96
svx/source/sidebar/insert/InsertPropertyPanel.src | 146
svx/source/sidebar/insert/SimpleToolBoxController.cxx | 85
svx/source/sidebar/insert/SimpleToolBoxController.hxx | 54
svx/source/sidebar/text/TextPropertyPanel.hrc | 2
svx/source/sidebar/text/TextPropertyPanel.src | 5
svx/source/sidebar/text/TextUnderlineControl.cxx | 32
svx/source/sidebar/text/TextUnderlineControl.hxx | 4
svx/source/svdraw/svdmrkv.cxx | 7
svx/source/svdraw/svdorect.cxx | 1
svx/source/xoutdev/xattrbmp.cxx | 4
svx/source/xoutdev/xtabbtmp.cxx | 24
svx/source/xoutdev/xtabcolr.cxx | 13
svx/source/xoutdev/xtabdash.cxx | 15
svx/source/xoutdev/xtabgrdt.cxx | 15
svx/source/xoutdev/xtabhtch.cxx | 15
svx/source/xoutdev/xtable.cxx | 145
svx/source/xoutdev/xtablend.cxx | 15
sw/source/ui/shells/drwtxtex.cxx | 20
vcl/inc/graphite_cache.hxx | 1
xml2cmp/source/x2cclass/x2cstl.hxx | 7
94 files changed, 3699 insertions(+), 2701 deletions(-)
New commits:
commit 2b634ab7db0dd20cb467b5b65b483c29c8cd0a71
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Fri May 3 17:35:40 2013 +0000
i120385 - apply patch from AOO34 branch
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 13f5c75..aaf67bb 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -137,7 +137,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
nDerivedKeySize = 0;
if ( !bIgnoreEncryptData )
{
- long nDigestId = 0;
+ sal_Int32 nDigestId = 0;
const OUString& rChecksumType = aConvertedAttribs[sChecksumTypeAttribute];
if( rChecksumType.equalsAscii( SHA1_1K_NAME )
|| rChecksumType.equalsAscii( SHA1_1K_URL ) )
@@ -164,7 +164,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
{
if ( !bIgnoreEncryptData )
{
- long nCypherId = 0;
+ sal_Int32 nCypherId = 0;
const OUString& rAlgoName = aConvertedAttribs[sAlgorithmNameAttribute];
if ( rAlgoName.equalsAscii( BLOWFISH_NAME )
|| rAlgoName.equalsAscii( BLOWFISH_URL ) )
commit cdc8cb702630938c673255638aecbd2dd5c53ed7
Author: Andre Fischer <af at apache.org>
Date: Fri May 3 15:08:26 2013 +0000
122218: Added more missing files.
diff --git a/sfx2/inc/sfx2/sidebar/Tools.hxx b/sfx2/inc/sfx2/sidebar/Tools.hxx
index c9d8486..9bed4fe 100755
--- a/sfx2/inc/sfx2/sidebar/Tools.hxx
+++ b/sfx2/inc/sfx2/sidebar/Tools.hxx
@@ -29,7 +29,9 @@
#include "sfx2/dllapi.h"
#include <com/sun/star/awt/Gradient.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/util/URL.hpp>
#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)))
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
new file mode 100755
index 0000000..d2baaa3
--- /dev/null
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -0,0 +1,419 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#include "precompiled_svx.hxx"
+
+#include "InsertPropertyPanel.hxx"
+#include "InsertPropertyPanel.hrc"
+#include "SimpleToolBoxController.hxx"
+#include "sfx2/sidebar/CommandInfoProvider.hxx"
+
+#include <sfx2/sidebar/Theme.hxx>
+#include <sfx2/sidebar/Tools.hxx>
+#include <sfx2/sidebar/ControlFactory.hxx>
+
+#include <svx/dialmgr.hxx>
+#include <svtools/miscopt.hxx>
+#include <vcl/toolbox.hxx>
+#include <sfx2/tbxctrl.hxx>
+#include <framework/sfxhelperfunctions.hxx>
+#include <framework/imageproducer.hxx>
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include <com/sun/star/frame/XStatusListener.hpp>
+
+using namespace css;
+using namespace cssu;
+using ::rtl::OUString;
+
+#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
+
+namespace svx { namespace sidebar {
+
+
+InsertPropertyPanel::InsertPropertyPanel (
+ Window* pParent,
+ const cssu::Reference<css::frame::XFrame>& rxFrame)
+ : Control(pParent, SVX_RES(RID_SIDEBAR_INSERT_PANEL)),
+ mpStandardShapesBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
+ mpStandardShapesToolBox(sfx2::sidebar::ControlFactory::CreateToolBox(
+ mpStandardShapesBackground.get(),
+ SVX_RES(TB_INSERT_STANDARD))),
+ mpCustomShapesBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
+ mpCustomShapesToolBox(sfx2::sidebar::ControlFactory::CreateToolBox(
+ mpCustomShapesBackground.get(),
+ SVX_RES(TB_INSERT_CUSTOM))),
+ maControllers(),
+ mxFrame(rxFrame)
+{
+ SetupToolBox(*mpStandardShapesToolBox);
+ SetupToolBox(*mpCustomShapesToolBox);
+ FreeResource();
+
+ UpdateIcons();
+
+ mpStandardShapesToolBox->Show();
+ mpCustomShapesToolBox->Show();
+
+ // Listen to all tool box selection events.
+ Window* pTopWindow = pParent;
+ while (pTopWindow->GetParent() != NULL)
+ pTopWindow = pTopWindow->GetParent();
+ pTopWindow->AddChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener));
+}
+
+
+
+
+InsertPropertyPanel::~InsertPropertyPanel (void)
+{
+ ControllerContainer aControllers;
+ aControllers.swap(maControllers);
+ for (ControllerContainer::iterator iController(aControllers.begin()), iEnd(aControllers.end());
+ iController!=iEnd;
+ ++iController)
+ {
+ Reference<lang::XComponent> xComponent (iController->second.mxController, UNO_QUERY);
+ if (xComponent.is())
+ xComponent->dispose();
+ }
+
+ // Remove window child listener.
+ Window* pTopWindow = this;
+ while (pTopWindow->GetParent() != NULL)
+ pTopWindow = pTopWindow->GetParent();
+ pTopWindow->RemoveChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener));
+
+ mpStandardShapesToolBox.reset();
+ mpCustomShapesToolBox.reset();
+ mpStandardShapesBackground.reset();
+ mpCustomShapesBackground.reset();
+}
+
+
+
+
+void InsertPropertyPanel::SetupToolBox (ToolBox& rToolBox)
+{
+ const sal_uInt16 nItemCount (rToolBox.GetItemCount());
+ for (sal_uInt16 nItemIndex=0; nItemIndex<nItemCount; ++nItemIndex)
+ CreateController(rToolBox.GetItemId(nItemIndex));
+
+ rToolBox.SetDropdownClickHdl(LINK(this, InsertPropertyPanel, DropDownClickHandler));
+ rToolBox.SetClickHdl(LINK(this, InsertPropertyPanel, ClickHandler));
+ rToolBox.SetDoubleClickHdl(LINK(this, InsertPropertyPanel, DoubleClickHandler));
+ rToolBox.SetSelectHdl(LINK(this, InsertPropertyPanel, SelectHandler));
+ rToolBox.SetActivateHdl(LINK(this, InsertPropertyPanel, Activate));
+ rToolBox.SetDeactivateHdl(LINK(this, InsertPropertyPanel, Deactivate));
+
+ rToolBox.SetSizePixel(rToolBox.CalcWindowSizePixel());
+}
+
+
+
+
+IMPL_LINK(InsertPropertyPanel, DropDownClickHandler, ToolBox*, pToolBox)
+{
+ if (pToolBox != NULL)
+ {
+ Reference<frame::XToolbarController> xController (GetControllerForItemId(pToolBox->GetCurItemId()));
+ if (xController.is())
+ {
+ Reference<awt::XWindow> xWindow = xController->createPopupWindow();
+ if (xWindow.is() )
+ xWindow->setFocus();
+ }
+ }
+ return 1;
+}
+
+
+
+
+IMPL_LINK(InsertPropertyPanel, ClickHandler, ToolBox*, pToolBox)
+{
+ if (pToolBox == NULL)
+ return 0;
+
+ Reference<frame::XToolbarController> xController (GetControllerForItemId(pToolBox->GetCurItemId()));
+ if (xController.is())
+ xController->click();
+
+ return 1;
+}
+
+
+
+
+IMPL_LINK(InsertPropertyPanel, DoubleClickHandler, ToolBox*, pToolBox)
+{
+ if (pToolBox == NULL)
+ return 0;
+
+ Reference<frame::XToolbarController> xController (GetControllerForItemId(pToolBox->GetCurItemId()));
+ if (xController.is())
+ xController->doubleClick();
+
+ return 1;
+}
+
+
+
+
+IMPL_LINK(InsertPropertyPanel, SelectHandler, ToolBox*, pToolBox)
+{
+ if (pToolBox == NULL)
+ return 0;
+
+ Reference<frame::XToolbarController> xController (GetControllerForItemId(pToolBox->GetCurItemId()));
+ if (xController.is())
+ xController->execute((sal_Int16)pToolBox->GetModifier());
+
+ return 1;
+}
+
+
+
+
+IMPL_LINK(InsertPropertyPanel, WindowEventListener, VclSimpleEvent*, pEvent)
+{
+ // We will be getting a lot of window events (well, basically all
+ // of them), so reject early everything that is not connected to
+ // toolbox selection.
+ if (pEvent == NULL)
+ return 1;
+ if ( ! pEvent->ISA(VclWindowEvent))
+ return 1;
+ if (pEvent->GetId() != VCLEVENT_TOOLBOX_SELECT)
+ return 1;
+
+ ToolBox* pToolBox = dynamic_cast<ToolBox*>(dynamic_cast<VclWindowEvent*>(pEvent)->GetWindow());
+ if (pToolBox == NULL)
+ return 1;
+
+ // Extract name of (sub)toolbar from help id.
+ OUString sToolbarName (rtl::OStringToOUString(pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8));
+ if (sToolbarName.getLength() == 0)
+ return 1;
+ const util::URL aURL (sfx2::sidebar::Tools::GetURL(sToolbarName));
+ if (aURL.Path.getLength() == 0)
+ return 1;
+
+ // Get item id.
+ sal_uInt16 nId = pToolBox->GetCurItemId();
+ if (nId == 0)
+ return 1;
+
+ // Get toolbar controller.
+ const sal_uInt16 nItemId (GetItemIdForSubToolbarName(aURL.Path));
+ Reference<frame::XSubToolbarController> xController (GetControllerForItemId(nItemId), UNO_QUERY);
+ if ( ! xController.is())
+ return 1;
+
+ const OUString sCommand (pToolBox->GetItemCommand(nId));
+ ControllerContainer::iterator iController (maControllers.find(nItemId));
+ if (iController != maControllers.end())
+ iController->second.msCurrentCommand = sCommand;
+ xController->functionSelected(sCommand);
+
+ const sal_Bool bBigImages (SvtMiscOptions().AreCurrentSymbolsLarge());
+ const bool bIsHighContrastActive (sfx2::sidebar::Theme::IsHighContrastMode());
+ Image aImage (framework::GetImageFromURL(mxFrame, sCommand, bBigImages, bIsHighContrastActive));
+ pToolBox->SetItemImage(iController->first, aImage);
+
+ return 1;
+}
+
+
+
+
+IMPL_LINK(InsertPropertyPanel, Activate, ToolBox*, EMPTYARG)
+{
+ return 1;
+}
+
+
+
+
+IMPL_LINK(InsertPropertyPanel, Deactivate, ToolBox*, EMPTYARG)
+{
+ return 1;
+}
+
+
+
+
+void InsertPropertyPanel::CreateController (
+ const sal_uInt16 nItemId)
+{
+ ToolBox* pToolBox = GetToolBoxForItemId(nItemId);
+ if (pToolBox != NULL)
+ {
+ ItemDescriptor aDescriptor;
+
+ const OUString sCommandName (pToolBox->GetItemCommand(nItemId));
+
+ // Create a controller for the new item.
+ aDescriptor.mxController.set(
+ static_cast<XWeak*>(::framework::CreateToolBoxController(
+ mxFrame,
+ pToolBox,
+ nItemId,
+ sCommandName)),
+ UNO_QUERY);
+ if ( ! aDescriptor.mxController.is())
+ aDescriptor.mxController.set(
+ static_cast<XWeak*>(new SimpleToolBoxController(mxFrame, *pToolBox, nItemId, sCommandName)),
+ UNO_QUERY);
+ if ( ! aDescriptor.mxController.is())
+ return;
+
+ // Get dispatch object for the command.
+ aDescriptor.maURL = sfx2::sidebar::Tools::GetURL(sCommandName);
+ aDescriptor.msCurrentCommand = sCommandName;
+ aDescriptor.mxDispatch = sfx2::sidebar::Tools::GetDispatch(mxFrame, aDescriptor.maURL);
+ if ( ! aDescriptor.mxDispatch.is())
+ return;
+
+ // Initialize the controller with eg a service factory.
+ Reference<lang::XInitialization> xInitialization (aDescriptor.mxController, UNO_QUERY);
+ if (xInitialization.is())
+ {
+ beans::PropertyValue aPropValue;
+ std::vector<Any> aPropertyVector;
+
+ aPropValue.Name = A2S("Frame");
+ aPropValue.Value <<= mxFrame;
+ aPropertyVector.push_back(makeAny(aPropValue));
+
+ aPropValue.Name = A2S("ServiceManager");
+ aPropValue.Value <<= ::comphelper::getProcessServiceFactory();
+ aPropertyVector.push_back(makeAny(aPropValue));
+
+ aPropValue.Name = A2S("CommandURL");
+ aPropValue.Value <<= sCommandName;
+ aPropertyVector.push_back(makeAny(aPropValue));
+
+ Sequence<Any> aArgs (comphelper::containerToSequence(aPropertyVector));
+ xInitialization->initialize(aArgs);
+ }
+
+ Reference<util::XUpdatable> xUpdatable (aDescriptor.mxController, UNO_QUERY);
+ if (xUpdatable.is())
+ xUpdatable->update();
+
+ // Add label.
+ const OUString sLabel (sfx2::sidebar::CommandInfoProvider::Instance().GetLabelForCommand(
+ sCommandName,
+ mxFrame));
+ pToolBox->SetQuickHelpText(nItemId, sLabel);
+
+ // Add item to toolbox.
+ pToolBox->EnableItem(nItemId);
+ maControllers.insert(::std::make_pair(nItemId, aDescriptor));
+ }
+}
+
+
+
+
+ToolBox* InsertPropertyPanel::GetToolBoxForItemId (const sal_uInt16 nItemId) const
+{
+ switch(nItemId)
+ {
+ case TBI_STANDARD_LINE:
+ case TBI_STANDARD_ARROW:
+ case TBI_STANDARD_RECTANGLE:
+ case TBI_STANDARD_ELLIPSE:
+ case TBI_STANDARD_TEXT:
+ case TBI_STANDARD_LINES:
+ case TBI_STANDARD_CONNECTORS:
+ case TBI_STANDARD_ARROWS:
+ return mpStandardShapesToolBox.get();
+
+ case TBI_CUSTOM_BASICS:
+ case TBI_CUSTOM_SYMBOLS:
+ case TBI_CUSTOM_ARROWS:
+ case TBI_CUSTOM_FLOWCHARTS:
+ case TBI_CUSTOM_CALLOUTS:
+ case TBI_CUSTOM_STARS:
+ return mpCustomShapesToolBox.get();
+
+ default:
+ return NULL;
+ }
+}
+
+
+
+
+Reference<frame::XToolbarController> InsertPropertyPanel::GetControllerForItemId (const sal_uInt16 nItemId) const
+{
+ ControllerContainer::const_iterator iController (maControllers.find(nItemId));
+ if (iController != maControllers.end())
+ return iController->second.mxController;
+ else
+ return NULL;
+}
+
+
+
+
+sal_uInt16 InsertPropertyPanel::GetItemIdForSubToolbarName (const OUString& rsSubToolbarName) const
+{
+ for (ControllerContainer::const_iterator iController(maControllers.begin()), iEnd(maControllers.end());
+ iController!=iEnd;
+ ++iController)
+ {
+ Reference<frame::XSubToolbarController> xSubToolbarController (iController->second.mxController, UNO_QUERY);
+ if (xSubToolbarController.is())
+ if (xSubToolbarController->getSubToolbarName().equals(rsSubToolbarName))
+ return iController->first;
+ }
+ return NULL;
+}
+
+
+
+
+void InsertPropertyPanel::UpdateIcons (void)
+{
+ const sal_Bool bBigImages (SvtMiscOptions().AreCurrentSymbolsLarge());
+ const bool bIsHighContrastActive (sfx2::sidebar::Theme::IsHighContrastMode());
+
+ for (ControllerContainer::iterator iController(maControllers.begin()), iEnd(maControllers.end());
+ iController!=iEnd;
+ ++iController)
+ {
+ const ::rtl::OUString sCommandURL (iController->second.msCurrentCommand);
+ Image aImage (framework::GetImageFromURL(mxFrame, sCommandURL, bBigImages, bIsHighContrastActive));
+ ToolBox* pToolBox = GetToolBoxForItemId(iController->first);
+ if (pToolBox != NULL)
+ pToolBox->SetItemImage(iController->first, aImage);
+ }
+}
+
+
+
+
+} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hrc b/svx/source/sidebar/insert/InsertPropertyPanel.hrc
new file mode 100755
index 0000000..7d7386d
--- /dev/null
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.hrc
@@ -0,0 +1,42 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#include "svx/dialogs.hrc"
+
+#define TB_INSERT_STANDARD 1
+#define TB_INSERT_CUSTOM 2
+
+
+#define TBI_STANDARD_LINE 10
+#define TBI_STANDARD_ARROW 11
+#define TBI_STANDARD_RECTANGLE 12
+#define TBI_STANDARD_ELLIPSE 13
+#define TBI_STANDARD_TEXT 14
+#define TBI_STANDARD_LINES 15
+#define TBI_STANDARD_CONNECTORS 16
+#define TBI_STANDARD_ARROWS 17
+
+#define TBI_CUSTOM_BASICS 20
+#define TBI_CUSTOM_SYMBOLS 21
+#define TBI_CUSTOM_ARROWS 22
+#define TBI_CUSTOM_FLOWCHARTS 23
+#define TBI_CUSTOM_CALLOUTS 24
+#define TBI_CUSTOM_STARS 25
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
new file mode 100755
index 0000000..6ae5412
--- /dev/null
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
@@ -0,0 +1,96 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#ifndef SVX_SIDEBAR_INSERT_PROPERTY_PAGE_HXX
+#define SVX_SIDEBAR_INSERT_PROPERTY_PAGE_HXX
+
+#include <boost/scoped_ptr.hpp>
+
+#include <vcl/ctrl.hxx>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XToolbarController.hpp>
+
+#include <map>
+
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+class ToolBox;
+
+namespace svx { namespace sidebar {
+
+class InsertPropertyPanel
+ : public Control
+{
+public:
+ InsertPropertyPanel (
+ Window* pParent,
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
+ virtual ~InsertPropertyPanel (void);
+
+private:
+ ::boost::scoped_ptr<Window> mpStandardShapesBackground;
+ ::boost::scoped_ptr<ToolBox> mpStandardShapesToolBox;
+ ::boost::scoped_ptr<Window> mpCustomShapesBackground;
+ ::boost::scoped_ptr<ToolBox> mpCustomShapesToolBox;
+ class ItemDescriptor
+ {
+ public:
+ cssu::Reference<css::frame::XToolbarController> mxController;
+ css::util::URL maURL;
+ rtl::OUString msCurrentCommand;
+ cssu::Reference<css::frame::XDispatch> mxDispatch;
+ };
+ typedef ::std::map<sal_uInt16, ItemDescriptor> ControllerContainer;
+ ControllerContainer maControllers;
+ const cssu::Reference<css::frame::XFrame> mxFrame;
+
+ /** Add listeners to toolbox and update its size to match its
+ content.
+ */
+ void SetupToolBox (ToolBox& rToolBox);
+ cssu::Reference<css::frame::XToolbarController> GetControllerForItemId (
+ const sal_uInt16 nItemId) const;
+ ToolBox* GetToolBoxForItemId (const sal_uInt16 nItemId) const;
+ sal_uInt16 GetItemIdForSubToolbarName (
+ const ::rtl::OUString& rsCOmmandName) const;
+
+ /** Create toolbox controller for one item.
+ */
+ void CreateController (
+ const sal_uInt16 nItemId);
+ void UpdateIcons (void);
+
+ DECL_LINK(DropDownClickHandler, ToolBox*);
+ DECL_LINK(ClickHandler, ToolBox*);
+ DECL_LINK(DoubleClickHandler, ToolBox*);
+ DECL_LINK(SelectHandler, ToolBox*);
+ DECL_LINK(WindowEventListener, VclSimpleEvent*);
+ DECL_LINK(Activate, ToolBox*);
+ DECL_LINK(Deactivate, ToolBox*);
+};
+
+
+} } // end of namespace ::svx::sidebar
+
+#endif
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.src b/svx/source/sidebar/insert/InsertPropertyPanel.src
new file mode 100755
index 0000000..b7ffc07
--- /dev/null
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.src
@@ -0,0 +1,146 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#include "InsertPropertyPanel.hrc"
+#include <sfx2/sidebar/ResourceDefinitions.hrc>
+#include "helpid.hrc"
+
+#define FIRST_LINE_Y SECTIONPAGE_MARGIN_VERTICAL_TOP
+#define SECOND_LINE_Y FIRST_LINE_Y + TOOLBOX_ITEM_HEIGHT + CONTROL_SPACING_VERTICAL + 1
+
+Control RID_SIDEBAR_INSERT_PANEL
+{
+ OutputSize = TRUE;
+ DialogControl = TRUE;
+ Border = FALSE;
+
+ Size = MAP_APPFONT(
+ PROPERTYPAGE_WIDTH,
+ SECTIONPAGE_MARGIN_VERTICAL_TOP
+ + TOOLBOX_ITEM_HEIGHT * 2
+ + CONTROL_SPACING_VERTICAL
+ + SECTIONPAGE_MARGIN_VERTICAL_BOT);
+ HelpID = HID_SIDEBAR_INSERT_PANEL;
+ Text = "Insert";
+
+ ToolBox TB_INSERT_STANDARD
+ {
+ SVLook = TRUE ;
+ Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, FIRST_LINE_Y);
+ Size = MAP_APPFONT (TOOLBOX_ITEM_WIDTH * 6 + TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT) ;
+ TabStop = TRUE ;
+ HelpID = HID_SIDEBAR_INSERT_TOOLBOX;
+ Text = "Insert Shapes";
+ ItemList =
+ {
+ ToolBoxItem
+ {
+ Identifier = TBI_STANDARD_LINE;
+ Command = ".uno:Line";
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_STANDARD_ARROW;
+ Command = ".uno:LineArrowEnd";
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_STANDARD_RECTANGLE;
+ Command = ".uno:Rect";
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_STANDARD_ELLIPSE;
+ Command = ".uno:Ellipse";
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_STANDARD_TEXT;
+ Command = ".uno:Text";
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_STANDARD_LINES;
+ Command = ".uno:LineToolbox";
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_STANDARD_CONNECTORS;
+ Command = ".uno:ConnectorToolbox";
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_STANDARD_ARROWS;
+ Command = ".uno:ArrowsToolbox";
+ DropDown = TRUE;
+ };
+ };
+ };
+
+ ToolBox TB_INSERT_CUSTOM
+ {
+ SVLook = TRUE ;
+ Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, SECOND_LINE_Y);
+ Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH * 6, TOOLBOX_ITEM_HEIGHT) ;
+ TabStop = TRUE ;
+ HelpID = HID_SIDEBAR_INSERT_TOOLBOX;
+ Text = "Insert";
+ ItemList =
+ {
+ ToolBoxItem
+ {
+ Identifier = TBI_CUSTOM_BASICS;
+ Command = ".uno:BasicShapes";
+ DropDown = TRUE;
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_CUSTOM_SYMBOLS;
+ Command = ".uno:SymbolShapes";
+ DropDown = TRUE;
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_CUSTOM_ARROWS;
+ Command = ".uno:ArrowShapes";
+ DropDown = TRUE;
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_CUSTOM_FLOWCHARTS;
+ Command = ".uno:FlowChartShapes";
+ DropDown = TRUE;
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_CUSTOM_CALLOUTS;
+ Command = ".uno:CalloutShapes";
+ DropDown = TRUE;
+ };
+ ToolBoxItem
+ {
+ Identifier = TBI_CUSTOM_STARS;
+ Command = ".uno:StarShapes";
+ DropDown = TRUE;
+ };
+ };
+ };
+};
diff --git a/svx/source/sidebar/insert/SimpleToolBoxController.cxx b/svx/source/sidebar/insert/SimpleToolBoxController.cxx
new file mode 100755
index 0000000..6b4e5c2
--- /dev/null
+++ b/svx/source/sidebar/insert/SimpleToolBoxController.cxx
@@ -0,0 +1,85 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#include "precompiled_svx.hxx"
+
+#include "SimpleToolBoxController.hxx"
+
+#include <comphelper/processfactory.hxx>
+#include <vcl/toolbox.hxx>
+#include <vos/mutex.hxx>
+#include <vcl/svapp.hxx>
+
+
+using namespace ::com::sun::star;
+
+namespace svx { namespace sidebar {
+
+SimpleToolBoxController::SimpleToolBoxController(
+ const cssu::Reference<css::frame::XFrame>& rxFrame,
+ ToolBox& rToolBox,
+ const sal_uInt16 nItemId,
+ const rtl::OUString& rsCommand)
+ : svt::ToolboxController(::comphelper::getProcessServiceFactory(), rxFrame, rsCommand),
+ mrToolbox(rToolBox),
+ mnItemId(nItemId)
+{
+}
+
+
+
+
+SimpleToolBoxController::~SimpleToolBoxController (void)
+{
+}
+
+
+
+
+void SAL_CALL SimpleToolBoxController::statusChanged (const css::frame::FeatureStateEvent& rEvent)
+ throw (cssu::RuntimeException)
+{
+ vos::OGuard aSolarMutexGuard (Application::GetSolarMutex());
+
+ if (m_bDisposed)
+ return;
+
+ mrToolbox.EnableItem(mnItemId, rEvent.IsEnabled);
+
+ sal_uInt16 nItemBits = mrToolbox.GetItemBits(mnItemId);
+ nItemBits &= ~TIB_CHECKABLE;
+ TriState eState = STATE_NOCHECK;
+
+ sal_Bool bValue;
+ if (rEvent.State >>= bValue)
+ {
+ // Boolean, treat it as checked/unchecked
+ mrToolbox.CheckItem(mnItemId, bValue);
+ if ( bValue )
+ eState = STATE_CHECK;
+ nItemBits |= TIB_CHECKABLE;
+ }
+
+ mrToolbox.SetItemState(mnItemId, eState);
+ mrToolbox.SetItemBits(mnItemId, nItemBits);
+}
+
+} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/insert/SimpleToolBoxController.hxx b/svx/source/sidebar/insert/SimpleToolBoxController.hxx
new file mode 100755
index 0000000..0e4071f
--- /dev/null
+++ b/svx/source/sidebar/insert/SimpleToolBoxController.hxx
@@ -0,0 +1,54 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#ifndef SVX_SIDEBAR_INSERT_SIMPLE_TOOLBOX_CONTROLLER_HXX
+#define SVX_SIDEBAR_INSERT_SIMPLE_TOOLBOX_CONTROLLER_HXX
+
+#include <svtools/toolboxcontroller.hxx>
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+namespace svx { namespace sidebar {
+
+class SimpleToolBoxController : public svt::ToolboxController
+{
+public:
+ SimpleToolBoxController(
+ const cssu::Reference<css::frame::XFrame>& rxFrame,
+ ToolBox& rToolBox,
+ const sal_uInt16 nItTemId,
+ const rtl::OUString& rsComand);
+ virtual ~SimpleToolBoxController (void);
+
+ // XStatusListener
+ virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent)
+ throw (cssu::RuntimeException);
+
+private:
+ ToolBox& mrToolbox;
+ const sal_uInt16 mnItemId;
+};
+
+} } // end of namespace svx::sidebar
+
+
+#endif
commit 99572ff12af758a256703884811c7915c79f27ec
Author: Andre Fischer <af at apache.org>
Date: Fri May 3 14:19:32 2013 +0000
122218: Added missing files to sfx2/inc/sfx2/sidebar.
diff --git a/sfx2/source/sidebar/CommandInfoProvider.hxx b/sfx2/inc/sfx2/sidebar/CommandInfoProvider.hxx
old mode 100644
new mode 100755
similarity index 98%
rename from sfx2/source/sidebar/CommandInfoProvider.hxx
rename to sfx2/inc/sfx2/sidebar/CommandInfoProvider.hxx
index e2b0c1c..35f114d
--- a/sfx2/source/sidebar/CommandInfoProvider.hxx
+++ b/sfx2/inc/sfx2/sidebar/CommandInfoProvider.hxx
@@ -22,6 +22,8 @@
#ifndef SIDEBAR_COMMAND_INFO_PROVIDER_HXX
#define SIDEBAR_COMMAND_INFO_PROVIDER_HXX
+#include "sfx2/dllapi.h"
+
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
@@ -35,7 +37,7 @@ namespace sfx2 { namespace sidebar {
/** Provide information about UNO commands like tooltip text with
keyboard accelerator.
*/
-class CommandInfoProvider
+class SFX2_DLLPUBLIC CommandInfoProvider
{
public:
/** Return the singleton instance.
diff --git a/sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc b/sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc
index 1349cef..e63a27f 100644
--- a/sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc
+++ b/sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc
@@ -1,26 +1,26 @@
/**************************************************************
-*
-* 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
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-*************************************************************/
-
-#ifndef _SFX_PROPERTYPANEL_HRC
-#define _SFX_PROPERTYPANEL_HRC
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#ifndef _SFX_SIDEBAR_RESOURCE_DEFINITIONS_HRC
+#define _SFX_SIDEBAR_RESOURCE_DEFINITIONS_HRC
#include <sfx2/sfx.hrc>
diff --git a/sfx2/source/sidebar/Tools.hxx b/sfx2/inc/sfx2/sidebar/Tools.hxx
old mode 100644
new mode 100755
similarity index 87%
rename from sfx2/source/sidebar/Tools.hxx
rename to sfx2/inc/sfx2/sidebar/Tools.hxx
index 155881b..c9d8486
--- a/sfx2/source/sidebar/Tools.hxx
+++ b/sfx2/inc/sfx2/sidebar/Tools.hxx
@@ -26,6 +26,8 @@
#include <vcl/gradient.hxx>
#include <tools/svborder.hxx>
+#include "sfx2/dllapi.h"
+
#include <com/sun/star/awt/Gradient.hpp>
#include <com/sun/star/frame/XFrame.hpp>
@@ -39,7 +41,7 @@ namespace cssu = ::com::sun::star::uno;
namespace sfx2 { namespace sidebar {
-class Tools
+class SFX2_DLLPUBLIC Tools
{
public:
static Image GetImage (
@@ -55,6 +57,11 @@ public:
static Gradient AwtToVclGradient (const css::awt::Gradient aGradient);
static SvBorder RectangleToSvBorder (const Rectangle aBox);
+
+ static css::util::URL GetURL (const ::rtl::OUString& rsCommand);
+ static cssu::Reference<css::frame::XDispatch> GetDispatch (
+ const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const css::util::URL& rURL);
};
commit 5e09229d726cbc288719c7466b277a4eb5bb244b
Author: Andre Fischer <af at apache.org>
Date: Fri May 3 13:01:13 2013 +0000
122218: Add new sidebar panel for inserting shapes into Draw documents.
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 33109ed..5e3ddbe 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -991,6 +991,29 @@
</prop>
</node>
+ <node oor:name="InsertPropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Insert Shapes</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>InsertPropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Draw, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/InsertPropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>50</value>
+ </prop>
+ </node>
+
</node>
</node>
</oor:component-data>
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 48cf6e5..8420a23 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -155,6 +155,8 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
Construct(GetDocSh(), ePageKind);
mpSelectionChangeHandler->Connect();
+
+ SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
}
/*************************************************************************
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 8b2ebf4..268dfd7 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -140,4 +140,6 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ControlFactory.hxx,s
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/Theme.hxx,sfx2/sidebar/Theme.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ILayoutableWindow.hxx,sfx2/sidebar/ILayoutableWindow.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/IContextChangeReceiver.hxx,sfx2/sidebar/IContextChangeReceiver.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/Tools.hxx,sfx2/sidebar/Tools.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/CommandInfoProvider.hxx,sfx2/sidebar/CommandInfoProvider.hxx))
diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx
index 0cb2591..268e219 100644
--- a/sfx2/source/sidebar/CommandInfoProvider.cxx
+++ b/sfx2/source/sidebar/CommandInfoProvider.cxx
@@ -21,7 +21,7 @@
#include "precompiled_sfx2.hxx"
-#include "CommandInfoProvider.hxx"
+#include "sfx2/sidebar/CommandInfoProvider.hxx"
#include <comphelper/processfactory.hxx>
#include <svtools/acceleratorexecute.hxx>
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 43d1aa2..d549a0d 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -28,7 +28,7 @@
#include "sfx2/imagemgr.hxx"
#include "sfx2/bindings.hxx"
#include <unotools/cmdoptions.hxx>
-#include "CommandInfoProvider.hxx"
+#include "sfx2/sidebar/CommandInfoProvider.hxx"
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
diff --git a/sfx2/source/sidebar/CustomImageRadioButton.cxx b/sfx2/source/sidebar/CustomImageRadioButton.cxx
index 7f1fccc..b51c100 100644
--- a/sfx2/source/sidebar/CustomImageRadioButton.cxx
+++ b/sfx2/source/sidebar/CustomImageRadioButton.cxx
@@ -25,7 +25,7 @@
#include "DrawHelper.hxx"
#include "Paint.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index da27741..c84c4ba 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -29,7 +29,7 @@
#include "Paint.hxx"
#include "Panel.hxx"
#include "ToolBoxBackground.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
#include <vcl/dockwin.hxx>
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index 21a9f98..e0f5e70 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -27,7 +27,7 @@
#include <vcl/image.hxx>
#ifdef DEBUG
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#endif
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index 9508f6a..aab47fa 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -23,7 +23,7 @@
#include "FocusManager.hxx"
#include "Panel.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "TitleBar.hxx"
#include <vcl/button.hxx>
#include <vcl/toolbox.hxx>
diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx
index bb40c46..d29bad0 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -25,7 +25,7 @@
#include "DrawHelper.hxx"
#include "Paint.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
using namespace ::com::sun::star;
diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx
index 1a3a964..d69514a 100644
--- a/sfx2/source/sidebar/Paint.cxx
+++ b/sfx2/source/sidebar/Paint.cxx
@@ -22,7 +22,7 @@
#include "precompiled_sfx2.hxx"
#include "Paint.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include <com/sun/star/awt/Gradient.hpp>
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 9dc9b1b..59b18f0 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -28,7 +28,7 @@
#include "Paint.hxx"
#ifdef DEBUG
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "Deck.hxx"
#endif
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 015dbbe..4327d84 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -32,7 +32,7 @@
#include <vcl/image.hxx>
#ifdef DEBUG
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#endif
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index ec0ad495..0ab3662 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -22,7 +22,7 @@
#include "precompiled_sfx2.hxx"
#include "ResourceManager.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include <unotools/confignode.hxx>
#include <comphelper/componentcontext.hxx>
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 1d8e211..8ac3eab 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -30,9 +30,9 @@
#include "TabBar.hxx"
#include "sfx2/sidebar/Theme.hxx"
#include "sfx2/sidebar/SidebarChildWindow.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "SidebarDockingWindow.hxx"
#include "Context.hxx"
-#include "Tools.hxx"
#include "sfxresid.hxx"
#include "sfx2/sfxsids.hrc"
@@ -146,8 +146,8 @@ SidebarController::SidebarController (
// Get the dispatch object as preparation to listen for changes of
// the read-only state.
- const util::URL aURL (GetURL(gsReadOnlyCommandName));
- mxReadOnlyModeDispatch = GetDispatch(aURL);
+ const util::URL aURL (Tools::GetURL(gsReadOnlyCommandName));
+ mxReadOnlyModeDispatch = Tools::GetDispatch(mxFrame, aURL);
if (mxReadOnlyModeDispatch.is())
mxReadOnlyModeDispatch->addStatusListener(this, aURL);
@@ -176,7 +176,7 @@ void SAL_CALL SidebarController::disposing (void)
static_cast<css::ui::XContextChangeEventListener*>(this));
if (mxReadOnlyModeDispatch.is())
- mxReadOnlyModeDispatch->removeStatusListener(this, GetURL(gsReadOnlyCommandName));
+ mxReadOnlyModeDispatch->removeStatusListener(this, Tools::GetURL(gsReadOnlyCommandName));
if (mpSplitWindow != NULL)
{
mpSplitWindow->RemoveEventListener(LINK(this, SidebarController, WindowEventHandler));
@@ -811,8 +811,8 @@ void SidebarController::ShowDetailMenu (const ::rtl::OUString& rsMenuCommand) co
{
try
{
- const util::URL aURL (GetURL(rsMenuCommand));
- Reference<frame::XDispatch> xDispatch (GetDispatch(aURL));
+ const util::URL aURL (Tools::GetURL(rsMenuCommand));
+ Reference<frame::XDispatch> xDispatch (Tools::GetDispatch(mxFrame, aURL));
if (xDispatch.is())
xDispatch->dispatch(aURL, Sequence<beans::PropertyValue>());
}
@@ -826,33 +826,6 @@ void SidebarController::ShowDetailMenu (const ::rtl::OUString& rsMenuCommand) co
-util::URL SidebarController::GetURL (const ::rtl::OUString& rsCommand) const
-{
- util::URL aURL;
- aURL.Complete = rsCommand;
-
- const ::comphelper::ComponentContext aComponentContext (::comphelper::getProcessServiceFactory());
- const Reference<util::XURLTransformer> xParser (
- aComponentContext.createComponent("com.sun.star.util.URLTransformer"),
- UNO_QUERY_THROW);
- xParser->parseStrict(aURL);
-
- return aURL;
-}
-
-
-
-
-Reference<frame::XDispatch> SidebarController::GetDispatch (const util::URL& rURL) const
-{
- Reference<frame::XDispatchProvider> xProvider (mxFrame, UNO_QUERY_THROW);
- Reference<frame::XDispatch> xDispatch (xProvider->queryDispatch(rURL, OUString(), 0));
- return xDispatch;
-}
-
-
-
-
::boost::shared_ptr<PopupMenu> SidebarController::CreatePopupMenu (
const ::std::vector<TabBar::DeckMenuData>& rDeckSelectionData,
const ::std::vector<TabBar::DeckMenuData>& rDeckShowData) const
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 5606f5c..03ab459 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -181,8 +181,6 @@ private:
const ::std::vector<TabBar::DeckMenuData>& rDeckSelectionData,
const ::std::vector<TabBar::DeckMenuData>& rDeckShowData) const;
void ShowDetailMenu (const ::rtl::OUString& rsMenuCommand) const;
- css::util::URL GetURL (const ::rtl::OUString& rsCommand) const;
- cssu::Reference<css::frame::XDispatch> GetDispatch (const css::util::URL& rURL) const;
::boost::shared_ptr<PopupMenu> CreatePopupMenu (
const ::std::vector<TabBar::DeckMenuData>& rDeckSelectionData,
const ::std::vector<TabBar::DeckMenuData>& rDeckShowData) const;
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index d858b9a..bfefc97 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -24,7 +24,7 @@
#include "SidebarToolBox.hxx"
#include "ToolBoxBackground.hxx"
#include "sfx2/sidebar/Theme.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include <vcl/gradient.hxx>
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 83c3ec6..0fcbb14 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -27,7 +27,7 @@
#include "DeckDescriptor.hxx"
#include "Paint.hxx"
#include "sfx2/sidebar/Theme.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "FocusManager.hxx"
#include <vcl/gradient.hxx>
diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx
index 9aa3faa..6ce0f30 100644
--- a/sfx2/source/sidebar/TabItem.cxx
+++ b/sfx2/source/sidebar/TabItem.cxx
@@ -25,7 +25,7 @@
#include "DrawHelper.hxx"
#include "Paint.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index d7f96e5..cce2663 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -24,7 +24,7 @@
#include "sfx2/sidebar/Theme.hxx"
#include "Paint.hxx"
#include "SidebarResource.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include <tools/svborder.hxx>
#include <tools/rc.hxx>
diff --git a/sfx2/source/sidebar/ToolBoxBackground.cxx b/sfx2/source/sidebar/ToolBoxBackground.cxx
index c182c2c..77d3b4b 100755
--- a/sfx2/source/sidebar/ToolBoxBackground.cxx
+++ b/sfx2/source/sidebar/ToolBoxBackground.cxx
@@ -24,7 +24,7 @@
#include "ToolBoxBackground.hxx"
#include "Paint.hxx"
#include "DrawHelper.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
#include <vcl/toolbox.hxx>
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index 5cd84b7..b6802dc 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -21,7 +21,7 @@
#include "precompiled_sfx2.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
@@ -31,7 +31,9 @@
#include <comphelper/namedvaluecollection.hxx>
#include <vcl/gradient.hxx>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <cstring>
@@ -153,4 +155,34 @@ SvBorder Tools::RectangleToSvBorder (const Rectangle aBox)
aBox.Bottom());
}
+
+
+
+util::URL Tools::GetURL (const ::rtl::OUString& rsCommand)
+{
+ util::URL aURL;
+ aURL.Complete = rsCommand;
+
+ const ::comphelper::ComponentContext aComponentContext (::comphelper::getProcessServiceFactory());
+ const Reference<util::XURLTransformer> xParser (
+ aComponentContext.createComponent("com.sun.star.util.URLTransformer"),
+ UNO_QUERY_THROW);
+ xParser->parseStrict(aURL);
+
+ return aURL;
+}
+
+
+
+
+Reference<frame::XDispatch> Tools::GetDispatch (
+ const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const util::URL& rURL)
+{
+ Reference<frame::XDispatchProvider> xProvider (rxFrame, UNO_QUERY_THROW);
+ Reference<frame::XDispatch> xDispatch (xProvider->queryDispatch(rURL, ::rtl::OUString(), 0));
+ return xDispatch;
+}
+
+
} } // end of namespace sfx2::sidebar
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index e51f421..7aa9bf5 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/sidebar/possize/PosSizePropertyPanel.src \
svx/source/sidebar/text/TextPropertyPanel.src \
svx/source/sidebar/paragraph/ParaPropertyPanel.src \
+ svx/source/sidebar/insert/InsertPropertyPanel.src \
svx/source/stbctrls/stbctrls.src \
svx/source/svdraw/svdstr.src \
svx/source/table/table.src \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 0146285..9281d88 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
cppu \
drawinglayer \
editeng \
+ fwe \
fwk \
i18nisolang1 \
icuuc \
@@ -211,6 +212,8 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/sidebar/tools/PopupContainer \
svx/source/sidebar/tools/Popup \
svx/source/sidebar/tools/ValueSetWithTextControl \
+ svx/source/sidebar/insert/InsertPropertyPanel \
+ svx/source/sidebar/insert/SimpleToolBoxController \
svx/source/stbctrls/pszctrl \
svx/source/stbctrls/insctrl \
svx/source/stbctrls/selctrl \
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 5c6056d..9297862 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -368,6 +368,9 @@
#define HID_PROPERTYPANEL_POSIZE_SECTION "SVX_HID_PROPERTYPANEL_POSIZE_SECTION"
#define HID_PROPERTYPANEL_GRAPHIC_SECTION "SVX_HID_PROPERTYPANEL_GRAPHIC_SECTION"
+// Insert panel
+#define HID_SIDEBAR_INSERT_PANEL "HID_SIDEBAR_INSERT_PANEL"
+#define HID_SIDEBAR_INSERT_TOOLBOX "HID_SIDEBAR_INSERT_TOOLBOX"
#define HID_PPROPERTYPANEL_PARA_TBX_NUM_BULLET "SVX_HID_PPROPERTYPANEL_PARA_TBX_NUM_BULLET"
#define HID_PPROPERTYPANEL_PARA_TBI_NUM "SVX_HID_PPROPERTYPANEL_PARA_TBI_NUM"
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index d27ceb6..db7687d 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -31,7 +31,7 @@
// Resource-Id's ------------------------------------------------------------
// !!! IMPORTANT: consider and update FIRSTFREE when introducing new RIDs !!! (not for RIDs for Strings - they have there own)
-#define RID_SVX_FIRSTFREE 324
+#define RID_SVX_FIRSTFREE 325
// some strings also used in CUI
#define RID_SVXERRCTX (RID_SVX_START + 351)
@@ -376,6 +376,8 @@
#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 322)
#define RID_POPUPPANEL_PARAPAGE_BACK_COLOR (RID_SVX_START + 323)
+#define RID_SIDEBAR_INSERT_PANEL (RID_SVX_START + 324)
+
// !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above)
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index dbe5a89..6b1ac6b 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -27,6 +27,7 @@
#include "graphic/GraphicPropertyPanel.hxx"
#include "line/LinePropertyPanel.hxx"
#include "possize/PosSizePropertyPanel.hxx"
+#include "insert/InsertPropertyPanel.hxx"
#include "GalleryControl.hxx"
#include "debug/ColorPanel.hxx"
#include "debug/ContextPanel.hxx"
@@ -160,6 +161,10 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
{
pControl = PosSizePropertyPanel::Create(pParentWindow, xFrame, pBindings, xSidebar);
}
+ else if (DoesResourceEndWith("/InsertPropertyPanel"))
+ {
+ pControl = new InsertPropertyPanel(pParentWindow, xFrame);
+ }
else if (DoesResourceEndWith("/GalleryPanel"))
{
pControl = new GalleryControl(pBindings, pParentWindow);
commit 5ffd11cb81aa2206fd523dab461c5bdbd6a00bcc
Author: Armin Le Grand <alg at apache.org>
Date: Fri May 3 12:22:53 2013 +0000
i122215 Avoid double paste, allow paste of WMF/EMF as bitmap
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index e83bb2f..e42795d 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1204,6 +1204,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
{
// if no object was inserted, insert a picture
InsertMetaFile( aDataHelper, rPos, pImageMap, true );
+ bReturn = true;
}
}
@@ -1273,7 +1274,29 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
{
BitmapEx aBmpEx;
- if( aDataHelper.GetBitmapEx( FORMAT_BITMAP, aBmpEx ) )
+ // get basic Bitmap data
+ aDataHelper.GetBitmapEx(FORMAT_BITMAP, aBmpEx);
+
+ if(aBmpEx.IsEmpty())
+ {
+ // if this did not work, try to get graphic formats and convert these to bitmap
+ Graphic aGraphic;
+
+ if(aDataHelper.GetGraphic(FORMAT_GDIMETAFILE, aGraphic))
+ {
+ aBmpEx = aGraphic.GetBitmapEx();
+ }
+ else if(aDataHelper.GetGraphic(SOT_FORMATSTR_ID_SVXB, aGraphic))
+ {
+ aBmpEx = aGraphic.GetBitmapEx();
+ }
+ else if(aDataHelper.GetGraphic(FORMAT_BITMAP, aGraphic))
+ {
+ aBmpEx = aGraphic.GetBitmapEx();
+ }
+ }
+
+ if(!aBmpEx.IsEmpty())
{
Point aInsertPos( rPos );
commit 3c4045722f20bddddef9143c4f393e6f251f6d2d
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Fri May 3 09:56:38 2013 +0000
122140: add 'None' entry to underline style drop-down-list in text property panel
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hrc b/svx/source/sidebar/text/TextPropertyPanel.hrc
index db306d8..266cce0 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hrc
+++ b/svx/source/sidebar/text/TextPropertyPanel.hrc
@@ -107,6 +107,8 @@
#define IMG_DASH_DOT_DOT_SEL 48
#define IMG_WAVE_SEL 49
+#define STR_WITHOUT 50
+
//popup window font color
#define VS_FONT_COLOR 1
#define STR_AUTOMATICE 2
diff --git a/svx/source/sidebar/text/TextPropertyPanel.src b/svx/source/sidebar/text/TextPropertyPanel.src
index 06324cb..da264dd 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.src
+++ b/svx/source/sidebar/text/TextPropertyPanel.src
@@ -392,6 +392,11 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE
ImageBitmap = Bitmap{File = "symphony/selected-line10.bmp";};
};
+ String STR_WITHOUT
+ {
+ Text [ en-US ] = "(Without)";
+ };
+
//tips
String STR_SINGLE
{
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 5edc625..e2cf9d5 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -97,6 +97,10 @@ void TextUnderlineControl::initial()
maVSUnderline.SetStyle( maVSUnderline.GetStyle()| WB_3DLOOK | WB_NO_DIRECTSELECT );
+ // 'none' item
+ maVSUnderline.SetStyle( maVSUnderline.GetStyle()| WB_NONEFIELD | WB_MENUSTYLEVALUESET );
+ maVSUnderline.SetText( String(SVX_RES(STR_WITHOUT) ) );
+
maVSUnderline.InsertItem(1, maIMGSingle ,String(SVX_RES(STR_SINGLE)));
maVSUnderline.SetItemData(1, (void*)(sal_uInt64)UNDERLINE_SINGLE);
@@ -203,6 +207,9 @@ void TextUnderlineControl::Rearrange(FontUnderline eLine)
maVSUnderline.GrabFocus();
break;
case UNDERLINE_NONE:
+ maVSUnderline.SelectItem(0);
+ maVSUnderline.GrabFocus();
+ break;
default:
maVSUnderline.SelectItem(1);
maVSUnderline.SetNoSelection();
@@ -214,10 +221,12 @@ void TextUnderlineControl::Rearrange(FontUnderline eLine)
IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl)
{
- if(pControl == &maVSUnderline)
+ if ( pControl == &maVSUnderline )
{
- sal_uInt16 iPos = maVSUnderline.GetSelectItemId();
- FontUnderline eUnderline = (FontUnderline)(sal_uInt64)maVSUnderline.GetItemData( iPos );
+ const sal_uInt16 iPos = maVSUnderline.GetSelectItemId();
+ const FontUnderline eUnderline = ( iPos == 0 )
+ ? UNDERLINE_NONE
+ : (FontUnderline)(sal_uInt64)maVSUnderline.GetItemData( iPos );
SvxUnderlineItem aLineItem(eUnderline, SID_ATTR_CHAR_UNDERLINE);
commit dc9abefa2d01377b14bef15463e360d9a7e9bdc2
Author: Armin Le Grand <alg at apache.org>
Date: Fri May 3 09:01:43 2013 +0000
i122198 added ColorValueSetColumnCount entry to configuration, default is 12
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 80c6b05..9c17cfe 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6185,6 +6185,19 @@
</info>
<value>25</value>
</prop>
+ <prop oor:name="ColorValueSetColumnCount" oor:type="xs:short">
+ <info>
+ <author>ALG</author>
+ <desc>
+ This option controls how many columns the ColorValueSets (the matrix-organized dialogs for color select)
+ will have. The default is 12 and this is aligned with the layout of the standard color palette. thus, when you
+ change this value, you should know what you do. This setting also influences some width-oriented layouts in
+ dialogs where this ColorValueSets are used, e.g. FillStyle dialog.
+ </desc>
+ <label>Defines the number of columns that will be shown in a ColorValueSet.</label>
+ </info>
+ <value>12</value>
+ </prop>
</group>
<set oor:name="OfficeObjects" oor:node-type="ObjectNames">
<info>
diff --git a/svtools/inc/svtools/accessibilityoptions.hxx b/svtools/inc/svtools/accessibilityoptions.hxx
index 32d962c..fc78c29 100644
--- a/svtools/inc/svtools/accessibilityoptions.hxx
+++ b/svtools/inc/svtools/accessibilityoptions.hxx
@@ -64,6 +64,11 @@ public:
// is in a ListBox, all will be shown, else a ScrollBar will be used
sal_Int16 GetListBoxMaximumLineCount() const;
+ // option to set the width of ColorValueSets in columns; this allows
+ // adaption to own colr set layouts. The default layout is 12 columns and should
+ // only be changed when the color palette is changed from the default
+ sal_Int16 GetColorValueSetColumnCount() const;
+
void SetIsForPagePreviews(sal_Bool bSet);
void SetIsHelpTipsDisappear(sal_Bool bSet);
void SetIsAllowAnimatedGraphics(sal_Bool bSet);
@@ -76,6 +81,7 @@ public:
void SetEdgeBlending(sal_Int16 nSet);
void SetListBoxMaximumLineCount(sal_Int16 nSet);
+ void SetColorValueSetColumnCount(sal_Int16 nSet);
sal_Bool IsModified() const;
void Commit();
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index e5e06a86..c2a02d7 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -88,6 +88,7 @@ public:
sal_Bool IsSelectionInReadonly() const;
sal_Int16 GetEdgeBlending() const;
sal_Int16 GetListBoxMaximumLineCount() const;
+ sal_Int16 GetColorValueSetColumnCount() const;
void SetAutoDetectSystemHC(sal_Bool bSet);
void SetIsForPagePreviews(sal_Bool bSet);
@@ -100,6 +101,7 @@ public:
void SetSelectionInReadonly(sal_Bool bSet);
void SetEdgeBlending(sal_Int16 nSet);
void SetListBoxMaximumLineCount(sal_Int16 nSet);
+ void SetColorValueSetColumnCount(sal_Int16 nSet);
sal_Bool IsModified() const { return bIsModified; };
};
@@ -340,6 +342,24 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetListBoxMaximumLineCount() const
return nRet;
}
+sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
+{
+ css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
+ sal_Int16 nRet = 12;
+
+ try
+ {
+ if(xNode.is())
+ xNode->getPropertyValue(s_sColorValueSetColumnCount) >>= nRet;
+ }
+ catch(const css::uno::Exception& ex)
+ {
+ LogHelper::logIt(ex);
+ }
+
+ return nRet;
+}
+
void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -556,6 +576,16 @@ void SvtAccessibilityOptions_Impl::SetVCLSettings()
StyleSettingsChanged = true;
}
+ const sal_Int16 nMaxColumnCountA(GetColorValueSetColumnCount());
+ OSL_ENSURE(nMaxColumnCountA >= 0, "OOps, negative values for ColorValueSetColumnCount are not allowed (!)");
+ const sal_uInt16 nMaxColumnCountB(static_cast< sal_uInt16 >(nMaxColumnCountA >= 0 ? nMaxColumnCountA : 0));
+
+ if(aStyleSettings.GetColorValueSetColumnCount() != nMaxColumnCountB)
+ {
+ aStyleSettings.SetColorValueSetColumnCount(nMaxColumnCountB);
+ StyleSettingsChanged = true;
+ }
+
if(StyleSettingsChanged)
{
aAllSettings.SetStyleSettings(aStyleSettings);
@@ -605,6 +635,26 @@ void SvtAccessibilityOptions_Impl::SetListBoxMaximumLineCount(sal_Int16 nSet)
}
}
+void SvtAccessibilityOptions_Impl::SetColorValueSetColumnCount(sal_Int16 nSet)
+{
+ css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
+
+ try
+ {
+ if(xNode.is() && xNode->getPropertyValue(s_sColorValueSetColumnCount)!=nSet)
+ {
+ xNode->setPropertyValue(s_sColorValueSetColumnCount, css::uno::makeAny(nSet));
+ ::comphelper::ConfigurationHelper::flush(m_xCfg);
+
+ bIsModified = sal_True;
+ }
+ }
+ catch(const css::uno::Exception& ex)
+ {
+ LogHelper::logIt(ex);
+ }
+}
+
// -----------------------------------------------------------------------
// class SvtAccessibilityOptions --------------------------------------------------
@@ -715,6 +765,10 @@ sal_Int16 SvtAccessibilityOptions::GetListBoxMaximumLineCount() const
{
return sm_pSingleImplConfig->GetListBoxMaximumLineCount();
}
+sal_Int16 SvtAccessibilityOptions::GetColorValueSetColumnCount() const
+{
+ return sm_pSingleImplConfig->GetColorValueSetColumnCount();
+}
// -----------------------------------------------------------------------
void SvtAccessibilityOptions::SetAutoDetectSystemHC(sal_Bool bSet)
@@ -765,4 +819,9 @@ void SvtAccessibilityOptions::SetListBoxMaximumLineCount(sal_Int16 nSet)
{
sm_pSingleImplConfig->SetListBoxMaximumLineCount(nSet);
}
+void SvtAccessibilityOptions::SetColorValueSetColumnCount(sal_Int16 nSet)
+{
+ sm_pSingleImplConfig->SetColorValueSetColumnCount(nSet);
+}
+
// -----------------------------------------------------------------------
diff --git a/svtools/source/inc/configitems/accessibilityoptions_const.hxx b/svtools/source/inc/configitems/accessibilityoptions_const.hxx
index 1103232..82199f8 100644
--- a/svtools/source/inc/configitems/accessibilityoptions_const.hxx
+++ b/svtools/source/inc/configitems/accessibilityoptions_const.hxx
@@ -31,18 +31,19 @@
namespace
{
- static const ::rtl::OUString s_sAccessibility = ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/Accessibility");
- static const ::rtl::OUString s_sAutoDetectSystemHC = ::rtl::OUString::createFromAscii("AutoDetectSystemHC");
- static const ::rtl::OUString s_sIsForPagePreviews = ::rtl::OUString::createFromAscii("IsForPagePreviews");
- static const ::rtl::OUString s_sIsHelpTipsDisappear = ::rtl::OUString::createFromAscii("IsHelpTipsDisappear");
- static const ::rtl::OUString s_sHelpTipSeconds = ::rtl::OUString::createFromAscii("HelpTipSeconds");
- static const ::rtl::OUString s_sIsAllowAnimatedGraphics = ::rtl::OUString::createFromAscii("IsAllowAnimatedGraphics");
- static const ::rtl::OUString s_sIsAllowAnimatedText = ::rtl::OUString::createFromAscii("IsAllowAnimatedText");
- static const ::rtl::OUString s_sIsAutomaticFontColor = ::rtl::OUString::createFromAscii("IsAutomaticFontColor");
- static const ::rtl::OUString s_sIsSystemFont = ::rtl::OUString::createFromAscii("IsSystemFont");
- static const ::rtl::OUString s_sIsSelectionInReadonly = ::rtl::OUString::createFromAscii("IsSelectionInReadonly");
- static const ::rtl::OUString s_sEdgeBlending = ::rtl::OUString::createFromAscii("EdgeBlending");
- static const ::rtl::OUString s_sListBoxMaximumLineCount = ::rtl::OUString::createFromAscii("ListBoxMaximumLineCount");
+ static const ::rtl::OUString s_sAccessibility = ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/Accessibility");
+ static const ::rtl::OUString s_sAutoDetectSystemHC = ::rtl::OUString::createFromAscii("AutoDetectSystemHC");
+ static const ::rtl::OUString s_sIsForPagePreviews = ::rtl::OUString::createFromAscii("IsForPagePreviews");
+ static const ::rtl::OUString s_sIsHelpTipsDisappear = ::rtl::OUString::createFromAscii("IsHelpTipsDisappear");
+ static const ::rtl::OUString s_sHelpTipSeconds = ::rtl::OUString::createFromAscii("HelpTipSeconds");
+ static const ::rtl::OUString s_sIsAllowAnimatedGraphics = ::rtl::OUString::createFromAscii("IsAllowAnimatedGraphics");
+ static const ::rtl::OUString s_sIsAllowAnimatedText = ::rtl::OUString::createFromAscii("IsAllowAnimatedText");
+ static const ::rtl::OUString s_sIsAutomaticFontColor = ::rtl::OUString::createFromAscii("IsAutomaticFontColor");
+ static const ::rtl::OUString s_sIsSystemFont = ::rtl::OUString::createFromAscii("IsSystemFont");
+ static const ::rtl::OUString s_sIsSelectionInReadonly = ::rtl::OUString::createFromAscii("IsSelectionInReadonly");
+ static const ::rtl::OUString s_sEdgeBlending = ::rtl::OUString::createFromAscii("EdgeBlending");
+ static const ::rtl::OUString s_sListBoxMaximumLineCount = ::rtl::OUString::createFromAscii("ListBoxMaximumLineCount");
+ static const ::rtl::OUString s_sColorValueSetColumnCount = ::rtl::OUString::createFromAscii("ColorValueSetColumnCount");
}
#endif // INCLUDE_CONFIGITEMS_ACCESSIBILITYOPTIONS_CONST_HXX
commit 3b31f1c781d367cfebdb388c17b22640d7e82539
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Fri May 3 08:53:37 2013 +0000
122079: activate missing slot invalidation for the cell alignment sidebar panel
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 42d2807..1c52baf 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2057,23 +2057,13 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
rSet.Put( rBrushItem, GetPool().GetWhich(nWhich) );
}
break;
-/* case SID_ATTR_ALIGN_LINEBREAK:
- {
- const SfxBoolItem& rBreakItem = (const SfxBoolItem&)rAttrSet.Get( ATTR_LINEBREAK );
- rSet.Put( rBreakItem, GetPool().GetWhich(nWhich) );
- }
- break;
-*/
}
nWhich = aIter.NextWhich();
}
- if(nWhich)
- {
- // stuff for sidebar panels
- Invalidate(SID_ATTR_ALIGN_DEGREES);
- Invalidate(SID_ATTR_ALIGN_STACKED);
- }
+ // stuff for sidebar panels
+ Invalidate(SID_ATTR_ALIGN_DEGREES);
+ Invalidate(SID_ATTR_ALIGN_STACKED);
}
//------------------------------------------------------------------
commit 73a1f473b72f86d84f3ae542b6c2750911d6c876
Author: Herbert Dürr <hdu at apache.org>
Date: Fri May 3 07:44:49 2013 +0000
update links for EPM
easysw.com closed its doors after 14years of business.
Thanks for providing EPM.
diff --git a/configure.in b/configure.in
index 500f2bd..e303691 100644
--- a/configure.in
+++ b/configure.in
@@ -117,7 +117,7 @@ AC_ARG_WITH(afms,
are known to be available.
],,)
AC_ARG_ENABLE(epm,
-[ --disable-epm OO.o includes self-packaging code, that requires
+[ --disable-epm AOO includes self-packaging code, that requires
epm, however epm is useless for large scale
package building.
],,enable_epm="yes")
@@ -129,9 +129,11 @@ AC_ARG_WITH(epm,
],,)
AC_ARG_WITH(epm-url,
[ --with-epm-url=<URL> Specify the location of downloadable epm 3.7 source code. For example:
- http://ftp.easysw.com/pub/epm/3.7/epm-3.7-source.tar.gz
- Note that epm is under GPL license.],
-[ EPM_URL="$withval"
+ http://epm.sourcearchive.com/downloads/3.7-1/epm_3.7.orig.tar.gz
+ or
+ http://www.msweet.org/files/project2/epm-3.7-source.tar.gz
+ Note that epm is under GPL license.
+],[ EPM_URL="$withval"
])
AC_ARG_WITH(package-format,
[ --with-package-format specify package format(s) for OOo installsets.
@@ -3541,14 +3543,14 @@ if test "$enable_epm" = "yes"; then
BUILD_TYPE="$BUILD_TYPE EPM"
else
if test "$EPM" = "no" ; then
- AC_MSG_ERROR([no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm (--with-epm). Or specify an Url to an epm-3.7 source package (--with-epm-url)])
+ AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm (--with-epm). Or specify an Url to an epm-3.7 source package (--with-epm-url)])
else
# Gentoo has some epm which is something different...
AC_MSG_CHECKING([whether the found epm is the right epm])
if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
AC_MSG_RESULT([yes])
else
- AC_MSG_ERROR([no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm])
+ AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm])
fi
AC_MSG_CHECKING([epm version])
EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
commit 0a210d567254d7e72c1f5f7950ae9cc5fc3d0bd9
Author: Jürgen Schmidt <jsc at apache.org>
Date: Fri May 3 05:53:32 2013 +0000
#122010# update python to ver 2.7.4
diff --git a/external_deps.lst b/external_deps.lst
index 92af377..6fbfbae 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -217,9 +217,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
- MD5 = c57477edd6d18bd9eeca2f21add73919
- name = Python-2.7.3.tar.bz2
- URL1 = http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2
+ MD5 = 62704ea0f125923208d84ff0568f7d50
+ name = Python-2.7.4.tar.bz2
+ URL1 = http://www.python.org/ftp/python/2.7.4/Python-2.7.4.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))
diff --git a/python/makefile.mk b/python/makefile.mk
index 1c2ec22..5c22086 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=c57477edd6d18bd9eeca2f21add73919
+TARFILE_MD5=62704ea0f125923208d84ff0568f7d50
PATCH_FILES=\
python-solaris.patch \
python-freebsd.patch \
diff --git a/python/prj/d.lst b/python/prj/d.lst
index 8ffaa3a..d862cf0 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy
mkdir: %_DEST%\lib%_EXT%\python\unittest
mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
-..\%__SRC%\misc\build\Python-2.7.3\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.3\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
-..\%__SRC%\misc\build\Python-2.7.3\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
-..\%__SRC%\misc\build\Python-2.7.3\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
+..\%__SRC%\misc\build\Python-2.7.4\Lib\* %_DEST%\lib%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.4\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.4\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
+..\%__SRC%\misc\build\Python-2.7.4\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
+..\%__SRC%\misc\build\Python-2.7.4\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk
-..\%__SRC%\misc\build\Python-2.7.3\Include\* %_DEST%\inc%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.4\Include\* %_DEST%\inc%_EXT%\python\*
#unix ONLY !
..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
-..\%__SRC%\misc\build\Python-2.7.3\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
+..\%__SRC%\misc\build\Python-2.7.4\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python
..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
@@ -91,24 +91,24 @@ symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so
#MingW ONLY !
..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.3\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
+..\%__SRC%\misc\build\Python-2.7.4\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
# WINDOWS ONLY !
..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-2.7.4\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
#linklib: libpython.so.*.*.*
diff --git a/python/python-2.7.3-nohardlink.patch b/python/python-2.7.4-nohardlink.patch
similarity index 76%
rename from python/python-2.7.3-nohardlink.patch
rename to python/python-2.7.4-nohardlink.patch
index 28ec007..3fd56b9 100644
--- a/python/python-2.7.3-nohardlink.patch
+++ b/python/python-2.7.4-nohardlink.patch
@@ -1,5 +1,5 @@
---- misc/Python-2.7.3/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
+--- misc/Python-2.7.4/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.4/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
@@ -427,7 +427,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
diff --git a/python/python-2.7.3-pcbuild.patch b/python/python-2.7.4-pcbuild.patch
similarity index 86%
rename from python/python-2.7.3-pcbuild.patch
rename to python/python-2.7.4-pcbuild.patch
index 92f110d..22c7d9e 100644
--- a/python/python-2.7.3-pcbuild.patch
+++ b/python/python-2.7.4-pcbuild.patch
@@ -1,6 +1,6 @@
-diff -u misc/Python-2.7.3/PCbuild/_bsddb.vcproj misc/build/Python-2.7.3/PCbuild/_bsddb.vcproj
---- misc/Python-2.7.3/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_bsddb.vcproj misc/build/Python-2.7.4/PCbuild/_bsddb.vcproj
+--- misc/Python-2.7.4/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -65,9 +65,9 @@ diff -u misc/Python-2.7.3/PCbuild/_bsddb.vcproj misc/build/Python-2.7.3/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-diff -u misc/Python-2.7.3/PCbuild/_ctypes.vcproj misc/build/Python-2.7.3/PCbuild/_ctypes.vcproj
---- misc/Python-2.7.3/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_ctypes.vcproj misc/build/Python-2.7.4/PCbuild/_ctypes.vcproj
+--- misc/Python-2.7.4/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -177,7 +177,7 @@
/>
<Tool
@@ -122,9 +122,9 @@ diff -u misc/Python-2.7.3/PCbuild/_ctypes.vcproj misc/build/Python-2.7.3/PCbuild
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-diff -u misc/Python-2.7.3/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.3/PCbuild/_ctypes_test.vcproj
---- misc/Python-2.7.3/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.4/PCbuild/_ctypes_test.vcproj
+--- misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -54,6 +54,7 @@
/>
<Tool
@@ -189,9 +189,9 @@ diff -u misc/Python-2.7.3/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.3/PC
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/_elementtree.vcproj misc/build/Python-2.7.3/PCbuild/_elementtree.vcproj
---- misc/Python-2.7.3/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_elementtree.vcproj misc/build/Python-2.7.4/PCbuild/_elementtree.vcproj
+--- misc/Python-2.7.4/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -256,9 +256,9 @@ diff -u misc/Python-2.7.3/PCbuild/_elementtree.vcproj misc/build/Python-2.7.3/PC
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/_hashlib.vcproj misc/build/Python-2.7.3/PCbuild/_hashlib.vcproj
---- misc/Python-2.7.3/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_hashlib.vcproj misc/build/Python-2.7.4/PCbuild/_hashlib.vcproj
+--- misc/Python-2.7.4/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -58,6 +58,7 @@
<Tool
Name="VCLinkerTool"
@@ -323,9 +323,9 @@ diff -u misc/Python-2.7.3/PCbuild/_hashlib.vcproj misc/build/Python-2.7.3/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/_msi.vcproj misc/build/Python-2.7.3/PCbuild/_msi.vcproj
---- misc/Python-2.7.3/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_msi.vcproj misc/build/Python-2.7.4/PCbuild/_msi.vcproj
+--- misc/Python-2.7.4/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
@@ -390,9 +390,9 @@ diff -u misc/Python-2.7.3/PCbuild/_msi.vcproj misc/build/Python-2.7.3/PCbuild/_m
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.3/PCbuild/_multiprocessing.vcproj
---- misc/Python-2.7.3/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.4/PCbuild/_multiprocessing.vcproj
+--- misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -457,9 +457,9 @@ diff -u misc/Python-2.7.3/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/_socket.vcproj misc/build/Python-2.7.3/PCbuild/_socket.vcproj
---- misc/Python-2.7.3/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_socket.vcproj misc/build/Python-2.7.4/PCbuild/_socket.vcproj
+--- misc/Python-2.7.4/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -524,9 +524,9 @@ diff -u misc/Python-2.7.3/PCbuild/_socket.vcproj misc/build/Python-2.7.3/PCbuild
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.3/PCbuild/_sqlite3.vcproj
---- misc/Python-2.7.3/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.4/PCbuild/_sqlite3.vcproj
+--- misc/Python-2.7.4/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -591,9 +591,9 @@ diff -u misc/Python-2.7.3/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.3/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/_ssl.vcproj misc/build/Python-2.7.3/PCbuild/_ssl.vcproj
---- misc/Python-2.7.3/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_ssl.vcproj misc/build/Python-2.7.4/PCbuild/_ssl.vcproj
+--- misc/Python-2.7.4/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -43,7 +43,7 @@
/>
<Tool
@@ -746,9 +746,9 @@ diff -u misc/Python-2.7.3/PCbuild/_ssl.vcproj misc/build/Python-2.7.3/PCbuild/_s
TargetMachine="17"
/>
<Tool
-diff -u misc/Python-2.7.3/PCbuild/_testcapi.vcproj misc/build/Python-2.7.3/PCbuild/_testcapi.vcproj
---- misc/Python-2.7.3/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_testcapi.vcproj misc/build/Python-2.7.4/PCbuild/_testcapi.vcproj
+--- misc/Python-2.7.4/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -813,9 +813,9 @@ diff -u misc/Python-2.7.3/PCbuild/_testcapi.vcproj misc/build/Python-2.7.3/PCbui
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/_tkinter.vcproj misc/build/Python-2.7.3/PCbuild/_tkinter.vcproj
---- misc/Python-2.7.3/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/_tkinter.vcproj misc/build/Python-2.7.4/PCbuild/_tkinter.vcproj
+--- misc/Python-2.7.4/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -880,9 +880,9 @@ diff -u misc/Python-2.7.3/PCbuild/_tkinter.vcproj misc/build/Python-2.7.3/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.3/PCbuild/bdist_wininst.vcproj
---- misc/Python-2.7.3/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.4/PCbuild/bdist_wininst.vcproj
+--- misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -81,8 +81,7 @@
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
@@ -903,9 +903,9 @@ diff -u misc/Python-2.7.3/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.3/P
TargetMachine="17"
/>
<Tool
-diff -u misc/Python-2.7.3/PCbuild/bz2.vcproj misc/build/Python-2.7.3/PCbuild/bz2.vcproj
---- misc/Python-2.7.3/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/bz2.vcproj misc/build/Python-2.7.4/PCbuild/bz2.vcproj
+--- misc/Python-2.7.4/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -970,9 +970,9 @@ diff -u misc/Python-2.7.3/PCbuild/bz2.vcproj misc/build/Python-2.7.3/PCbuild/bz2
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/kill_python.vcproj misc/build/Python-2.7.3/PCbuild/kill_python.vcproj
---- misc/Python-2.7.3/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/kill_python.vcproj misc/build/Python-2.7.4/PCbuild/kill_python.vcproj
+--- misc/Python-2.7.4/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
@@ -1005,9 +1005,9 @@ diff -u misc/Python-2.7.3/PCbuild/kill_python.vcproj misc/build/Python-2.7.3/PCb
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.3/PCbuild/make_buildinfo.vcproj
---- misc/Python-2.7.3/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.4/PCbuild/make_buildinfo.vcproj
+--- misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -61,6 +61,7 @@
OutputFile="$(OutDir)/make_buildinfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
@@ -1024,9 +1024,9 @@ diff -u misc/Python-2.7.3/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.3/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.3/PCbuild/make_versioninfo.vcproj
---- misc/Python-2.7.3/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.4/PCbuild/make_versioninfo.vcproj
+--- misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -71,6 +71,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -1059,9 +1059,9 @@ diff -u misc/Python-2.7.3/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.3/PCbuild/pcbuild.sln misc/build/Python-2.7.3/PCbuild/pcbuild.sln
---- misc/Python-2.7.3/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500
+diff -u misc/Python-2.7.4/PCbuild/pcbuild.sln misc/build/Python-2.7.4/PCbuild/pcbuild.sln
+--- misc/Python-2.7.4/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.4/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500
@@ -38,17 +38,17 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
@@ -1166,9 +1166,9 @@ diff -u misc/Python-2.7.3/PCbuild/pcbuild.sln misc/build/Python-2.7.3/PCbuild/pc
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list