You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/03/30 19:27:44 UTC
svn commit: r1462835 [4/4] - in /openoffice/branches/sidebar/main:
default_images/sc/res/sidebar/
officecfg/registry/data/org/openoffice/Office/UI/ sc/inc/ sc/prj/ sc/sdi/
sc/source/core/data/ sc/source/ui/app/ sc/source/ui/inc/
sc/source/ui/sidebar/ s...
Added: openoffice/branches/sidebar/main/sc/source/ui/sidebar/ScPanelFactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/sidebar/ScPanelFactory.cxx?rev=1462835&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/sidebar/ScPanelFactory.cxx (added)
+++ openoffice/branches/sidebar/main/sc/source/ui/sidebar/ScPanelFactory.cxx Sat Mar 30 18:27:42 2013
@@ -0,0 +1,142 @@
+/**************************************************************
+ *
+ * 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_sc.hxx"
+
+#include "ScPanelFactory.hxx"
+
+#include <AlignmentPropertyPanel.hxx>
+#include <CellAppearancePropertyPanel.hxx>
+
+#include <sfx2/sidebar/SidebarPanelBase.hxx>
+#include <sfx2/sfxbasecontroller.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/window.hxx>
+#include <rtl/ref.hxx>
+#include <comphelper/namedvaluecollection.hxx>
+
+#include <boost/bind.hpp>
+
+
+using namespace css;
+using namespace cssu;
+using ::rtl::OUString;
+
+
+namespace sc { namespace sidebar {
+
+#define A2S(s) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
+#define IMPLEMENTATION_NAME "org.apache.openoffice.comp.sc.sidebar.ScPanelFactory"
+#define SERVICE_NAME "com.sun.star.ui.UIElementFactory"
+
+
+::rtl::OUString SAL_CALL ScPanelFactory::getImplementationName (void)
+{
+ return A2S(IMPLEMENTATION_NAME);
+}
+
+
+cssu::Reference<cssu::XInterface> SAL_CALL ScPanelFactory::createInstance(
+ const uno::Reference<lang::XMultiServiceFactory>& )
+{
+ ::rtl::Reference<ScPanelFactory> pPanelFactory (new ScPanelFactory());
+ cssu::Reference<cssu::XInterface> xService (static_cast<XWeak*>(pPanelFactory.get()), cssu::UNO_QUERY);
+ return xService;
+}
+
+
+cssu::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames (void)
+{
+ cssu::Sequence<OUString> aServiceNames (1);
+ aServiceNames[0] = A2S(SERVICE_NAME);
+ return aServiceNames;
+
+}
+
+
+ScPanelFactory::ScPanelFactory (void)
+ : PanelFactoryInterfaceBase(m_aMutex)
+{
+}
+
+
+ScPanelFactory::~ScPanelFactory (void)
+{
+}
+
+
+Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement (
+ const ::rtl::OUString& rsResourceURL,
+ const ::cssu::Sequence<css::beans::PropertyValue>& rArguments)
+ throw(
+ container::NoSuchElementException,
+ lang::IllegalArgumentException,
+ RuntimeException)
+{
+ Reference<ui::XUIElement> xElement;
+
+ const ::comphelper::NamedValueCollection aArguments (rArguments);
+ Reference<frame::XFrame> xFrame (aArguments.getOrDefault("Frame", Reference<frame::XFrame>()));
+ Reference<awt::XWindow> xParentWindow (aArguments.getOrDefault("ParentWindow", Reference<awt::XWindow>()));
+ const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0)));
+ SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue);
+
+ ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+ if ( ! xParentWindow.is() || pParentWindow==NULL)
+ throw RuntimeException(
+ A2S("PanelFactory::createUIElement called without ParentWindow"),
+ NULL);
+ if ( ! xFrame.is())
+ throw RuntimeException(
+ A2S("PanelFactory::createUIElement called without Frame"),
+ NULL);
+ if (pBindings == NULL)
+ throw RuntimeException(
+ A2S("PanelFactory::createUIElement called without SfxBindings"),
+ NULL);
+
+#define DoesResourceEndWith(s) rsResourceURL.endsWithAsciiL(s,strlen(s))
+ if (DoesResourceEndWith("/AlignmentPropertyPanel"))
+ {
+ AlignmentPropertyPanel* pPanel = AlignmentPropertyPanel::Create( pParentWindow, xFrame, pBindings );
+ xElement = sfx2::sidebar::SidebarPanelBase::Create(
+ rsResourceURL,
+ xFrame,
+ pPanel,
+ ui::LayoutSize(-1,-1,-1));
+ }
+ if (DoesResourceEndWith("/CellAppearancePropertyPanel"))
+ {
+ CellAppearancePropertyPanel* pPanel = CellAppearancePropertyPanel::Create( pParentWindow, xFrame, pBindings );
+ xElement = sfx2::sidebar::SidebarPanelBase::Create(
+ rsResourceURL,
+ xFrame,
+ pPanel,
+ ui::LayoutSize(-1,-1,-1));
+ }
+#undef DoesResourceEndWith
+
+ return xElement;
+}
+
+} } // end of namespace sc::sidebar
+
+// eof
Propchange: openoffice/branches/sidebar/main/sc/source/ui/sidebar/ScPanelFactory.cxx
------------------------------------------------------------------------------
svn:executable = *
Added: openoffice/branches/sidebar/main/sc/source/ui/sidebar/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/sidebar/makefile.mk?rev=1462835&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/sidebar/makefile.mk (added)
+++ openoffice/branches/sidebar/main/sc/source/ui/sidebar/makefile.mk Sat Mar 30 18:27:42 2013
@@ -0,0 +1,53 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=sc
+TARGET=sidebar
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=$(TARGET)
+SRC1FILES = \
+ AlignmentPropertyPanel.src \
+ CellAppearancePropertyPanel.src
+
+SLOFILES = \
+ $(SLO)$/ScPanelFactory.obj \
+ $(SLO)$/AlignmentPropertyPanel.obj \
+ $(SLO)$/CellLineStyleControl.obj \
+ $(SLO)$/CellLineStylePopup.obj \
+ $(SLO)$/CellLineStyleValueSet.obj \
+ $(SLO)$/CellBorderUpdater.obj \
+ $(SLO)$/CellAppearancePropertyPanel.obj \
+ $(SLO)$/CellBorderStyleControl.obj \
+ $(SLO)$/CellBorderStylePopup.obj
+
+# --- Tagets -------------------------------------------------------
+
+.INCLUDE : target.mk
+
Propchange: openoffice/branches/sidebar/main/sc/source/ui/sidebar/makefile.mk
------------------------------------------------------------------------------
svn:executable = *
Modified: openoffice/branches/sidebar/main/sc/source/ui/unoobj/appluno.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/unoobj/appluno.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/unoobj/appluno.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/unoobj/appluno.cxx Sat Mar 30 18:27:42 2013
@@ -45,6 +45,7 @@
#include "unonames.hxx"
#include "funcdesc.hxx"
#include <com/sun/star/sheet/FunctionArgument.hpp>
+#include "ScPanelFactory.hxx"
using namespace com::sun::star;
@@ -198,154 +199,189 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL com
rtl::OUString aImpl(rtl::OUString::createFromAscii(pImplName));
if ( aImpl == ScSpreadsheetSettings::getImplementationName_Static() )
+ {
xFactory.set(cppu::createOneInstanceFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScSpreadsheetSettings::getImplementationName_Static(),
ScSpreadsheetSettings_CreateInstance,
ScSpreadsheetSettings::getSupportedServiceNames_Static() ));
-
- if ( aImpl == ScRecentFunctionsObj::getImplementationName_Static() )
+ }
+ else if ( aImpl == ScRecentFunctionsObj::getImplementationName_Static() )
+ {
xFactory.set(cppu::createOneInstanceFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScRecentFunctionsObj::getImplementationName_Static(),
ScRecentFunctionsObj_CreateInstance,
ScRecentFunctionsObj::getSupportedServiceNames_Static() ));
-
- if ( aImpl == ScFunctionListObj::getImplementationName_Static() )
+ }
+ else if ( aImpl == ScFunctionListObj::getImplementationName_Static() )
+ {
xFactory.set(cppu::createOneInstanceFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScFunctionListObj::getImplementationName_Static(),
ScFunctionListObj_CreateInstance,
ScFunctionListObj::getSupportedServiceNames_Static() ));
-
- if ( aImpl == ScAutoFormatsObj::getImplementationName_Static() )
+ }
+ else if ( aImpl == ScAutoFormatsObj::getImplementationName_Static() )
+ {
xFactory.set(cppu::createOneInstanceFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScAutoFormatsObj::getImplementationName_Static(),
ScAutoFormatsObj_CreateInstance,
ScAutoFormatsObj::getSupportedServiceNames_Static() ));
-
- if ( aImpl == ScFunctionAccess::getImplementationName_Static() )
+ }
+ else if ( aImpl == ScFunctionAccess::getImplementationName_Static() )
+ {
xFactory.set(cppu::createOneInstanceFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScFunctionAccess::getImplementationName_Static(),
ScFunctionAccess_CreateInstance,
ScFunctionAccess::getSupportedServiceNames_Static() ));
-
- if ( aImpl == ScFilterOptionsObj::getImplementationName_Static() )
+ }
+ else if ( aImpl == ScFilterOptionsObj::getImplementationName_Static() )
+ {
xFactory.set(cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScFilterOptionsObj::getImplementationName_Static(),
ScFilterOptionsObj_CreateInstance,
ScFilterOptionsObj::getSupportedServiceNames_Static() ));
-
- if ( aImpl == ScXMLImport_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLImport_getImplementationName() )
+ {
xFactory.set(cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLImport_getImplementationName(),
ScXMLImport_createInstance,
ScXMLImport_getSupportedServiceNames() ));
-
- if ( aImpl == ScXMLImport_Meta_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLImport_Meta_getImplementationName() )
+ {
xFactory.set(cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLImport_Meta_getImplementationName(),
ScXMLImport_Meta_createInstance,
ScXMLImport_Meta_getSupportedServiceNames() ));
-
- if ( aImpl == ScXMLImport_Styles_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLImport_Styles_getImplementationName() )
+ {
xFactory.set(cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLImport_Styles_getImplementationName(),
ScXMLImport_Styles_createInstance,
ScXMLImport_Styles_getSupportedServiceNames() ));
-
- if ( aImpl == ScXMLImport_Content_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLImport_Content_getImplementationName() )
+ {
xFactory.set(cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLImport_Content_getImplementationName(),
ScXMLImport_Content_createInstance,
ScXMLImport_Content_getSupportedServiceNames() ));
-
- if ( aImpl == ScXMLImport_Settings_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLImport_Settings_getImplementationName() )
+ {
xFactory.set(cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLImport_Settings_getImplementationName(),
ScXMLImport_Settings_createInstance,
ScXMLImport_Settings_getSupportedServiceNames() ));
-
- if ( aImpl == ScXMLOOoExport_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLOOoExport_getImplementationName() )
+ {
xFactory = cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLOOoExport_getImplementationName(),
ScXMLOOoExport_createInstance,
ScXMLOOoExport_getSupportedServiceNames() );
-
- if ( aImpl == ScXMLOOoExport_Meta_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLOOoExport_Meta_getImplementationName() )
+ {
xFactory = cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLOOoExport_Meta_getImplementationName(),
ScXMLOOoExport_Meta_createInstance,
ScXMLOOoExport_Meta_getSupportedServiceNames() );
-
- if ( aImpl == ScXMLOOoExport_Styles_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLOOoExport_Styles_getImplementationName() )
+ {
xFactory = cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLOOoExport_Styles_getImplementationName(),
ScXMLOOoExport_Styles_createInstance,
ScXMLOOoExport_Styles_getSupportedServiceNames() );
-
- if ( aImpl == ScXMLOOoExport_Content_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLOOoExport_Content_getImplementationName() )
+ {
xFactory = cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLOOoExport_Content_getImplementationName(),
ScXMLOOoExport_Content_createInstance,
ScXMLOOoExport_Content_getSupportedServiceNames() );
-
- if ( aImpl == ScXMLOOoExport_Settings_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLOOoExport_Settings_getImplementationName() )
+ {
xFactory = cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLOOoExport_Settings_getImplementationName(),
ScXMLOOoExport_Settings_createInstance,
ScXMLOOoExport_Settings_getSupportedServiceNames() );
-
- if ( aImpl == ScXMLOasisExport_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLOasisExport_getImplementationName() )
+ {
xFactory = cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLOasisExport_getImplementationName(),
ScXMLOasisExport_createInstance,
ScXMLOasisExport_getSupportedServiceNames() );
- if ( aImpl == ScXMLOasisExport_Meta_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLOasisExport_Meta_getImplementationName() )
+ {
xFactory = cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLOasisExport_Meta_getImplementationName(),
ScXMLOasisExport_Meta_createInstance,
ScXMLOasisExport_Meta_getSupportedServiceNames() );
- if ( aImpl == ScXMLOasisExport_Styles_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLOasisExport_Styles_getImplementationName() )
+ {
xFactory = cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLOasisExport_Styles_getImplementationName(),
ScXMLOasisExport_Styles_createInstance,
ScXMLOasisExport_Styles_getSupportedServiceNames() );
- if ( aImpl == ScXMLOasisExport_Content_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLOasisExport_Content_getImplementationName() )
+ {
xFactory = cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLOasisExport_Content_getImplementationName(),
ScXMLOasisExport_Content_createInstance,
ScXMLOasisExport_Content_getSupportedServiceNames() );
- if ( aImpl == ScXMLOasisExport_Settings_getImplementationName() )
+ }
+ else if ( aImpl == ScXMLOasisExport_Settings_getImplementationName() )
+ {
xFactory = cppu::createSingleFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScXMLOasisExport_Settings_getImplementationName(),
ScXMLOasisExport_Settings_createInstance,
ScXMLOasisExport_Settings_getSupportedServiceNames() );
-
- if ( aImpl == ScDocument_getImplementationName() )
+ }
+ else if ( aImpl == ScDocument_getImplementationName() )
+ {
xFactory.set(sfx2::createSfxModelFactory(
reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
ScDocument_getImplementationName(),
ScDocument_createInstance,
ScDocument_getSupportedServiceNames() ));
+ }
+ else if ( aImpl == ::sc::sidebar::ScPanelFactory::getImplementationName() )
+ {
+ xFactory = ::cppu::createSingleFactory(
+ reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
+ ::sc::sidebar::ScPanelFactory::getImplementationName(),
+ ::sc::sidebar::ScPanelFactory::createInstance,
+ ::sc::sidebar::ScPanelFactory::getSupportedServiceNames() );
+ }
void* pRet = NULL;
if (xFactory.is())
Modified: openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/cellsh3.cxx Sat Mar 30 18:27:42 2013
@@ -360,6 +360,10 @@ void ScCellShell::Execute( SfxRequest& r
pTabViewShell->ExecuteCellFormatDlg( rReq, TP_ALIGNMENT );
break;
+ case SID_CELL_FORMAT_BORDER:
+ pTabViewShell->ExecuteCellFormatDlg( rReq, TP_BORDER );
+ break;
+
case SID_CHAR_DLG_EFFECT:
pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONTEFF );
break;
Modified: openoffice/branches/sidebar/main/sc/source/ui/view/formatsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/view/formatsh.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/formatsh.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/formatsh.cxx Sat Mar 30 18:27:42 2013
@@ -1622,6 +1622,44 @@ void ScFormatShell::ExecuteAttr( SfxRequ
}
break;
+ case SID_ATTR_BORDER_DIAG_TLBR:
+ case SID_ATTR_BORDER_DIAG_BLTR:
+ {
+ ScDocument* pDoc = GetViewData()->GetDocument();
+ const ScPatternAttr* pOldAttrs = pTabViewShell->GetSelectionPattern();
+ SfxItemSet* pOldSet = new SfxItemSet(pOldAttrs->GetItemSet());
+ SfxItemSet* pNewSet = new SfxItemSet(pOldAttrs->GetItemSet());
+ const SfxPoolItem* pItem = 0;
+
+ if(SID_ATTR_BORDER_DIAG_TLBR == nSlot)
+ {
+ if(SFX_ITEM_SET == pNewAttrs->GetItemState(ATTR_BORDER_TLBR, true, &pItem))
+ {
+ SvxLineItem aItem(ATTR_BORDER_TLBR);
+ aItem.SetLine(((const SvxLineItem&)pNewAttrs->Get(ATTR_BORDER_TLBR)).GetLine());
+ pNewSet->Put(aItem);
+ rReq.AppendItem(aItem);
+ pTabViewShell->ApplyAttributes(pNewSet, pOldSet);
+ }
+ }
+ else // if( nSlot == SID_ATTR_BORDER_DIAG_BLTR )
+ {
+ if(SFX_ITEM_SET == pNewAttrs->GetItemState(ATTR_BORDER_BLTR, true, &pItem ))
+ {
+ SvxLineItem aItem(ATTR_BORDER_BLTR);
+ aItem.SetLine(((const SvxLineItem&)pNewAttrs->Get(ATTR_BORDER_BLTR)).GetLine());
+ pNewSet->Put(aItem);
+ rReq.AppendItem(aItem);
+ pTabViewShell->ApplyAttributes(pNewSet, pOldSet);
+ }
+ }
+
+ delete pOldSet;
+ delete pNewSet;
+ rBindings.Invalidate(nSlot);
+ }
+ break;
+
// ATTR_BACKGROUND (=SID_ATTR_BRUSH) muss ueber zwei IDs
// gesetzt werden:
case SID_BACKGROUND_COLOR:
@@ -1700,11 +1738,184 @@ void ScFormatShell::GetAttrState( SfxIte
case SID_BACKGROUND_COLOR:
{
rSet.Put( SvxColorItem( rBrushItem.GetColor(), SID_BACKGROUND_COLOR ) );
+
+ if(SFX_ITEM_DONTCARE == rAttrSet.GetItemState(ATTR_BACKGROUND))
+ {
+ rSet.InvalidateItem(SID_BACKGROUND_COLOR);
+ }
}
break;
+ case SID_FRAME_LINESTYLE:
case SID_FRAME_LINECOLOR:
{
- rSet.Put( SvxColorItem( pLine ? pLine->GetColor() : Color(), SID_FRAME_LINECOLOR ) );
+ // handled together because both need the cell border information for decisions
+ // rSet.Put( SvxColorItem( pLine ? pLine->GetColor() : Color(), SID_FRAME_LINECOLOR ) );
+ Color aCol = 0;
+ sal_uInt16 nOut = 0, nIn = 0, nDis = 0;
+ SvxBorderLine aLine(0,0,0,0);
+ bool bCol = 0;
+ bool bColDisable = 0, bStyleDisable = 0;
+ SvxBoxItem aBoxItem(ATTR_BORDER);
+ SvxBoxInfoItem aInfoItem(ATTR_BORDER_INNER);
+
+ pTabViewShell->GetSelectionFrame(aBoxItem, aInfoItem);
+
+ if( aBoxItem.GetTop() )
+ {
+ bCol = 1;
+ aCol = aBoxItem.GetTop()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aBoxItem.GetTop()->GetOutWidth());
+ aLine.SetInWidth( aBoxItem.GetTop()->GetInWidth());
+ aLine.SetDistance( aBoxItem.GetTop()->GetDistance());
+ }
+
+ if( aBoxItem.GetBottom() )
+ {
+ if(bCol == 0)
+ {
+ bCol = 1;
+ aCol = aBoxItem.GetBottom()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aBoxItem.GetBottom()->GetOutWidth());
+ aLine.SetInWidth( aBoxItem.GetBottom()->GetInWidth());
+ aLine.SetDistance( aBoxItem.GetBottom()->GetDistance());
+ }
+ else
+ {
+ if(aCol != aBoxItem.GetBottom()->GetColor() )
+ bColDisable = 1;
+ if(!( aLine == *(aBoxItem.GetBottom())) )
+ bStyleDisable = 1;
+ }
+ }
+
+ if( aBoxItem.GetLeft() )
+ {
+ if(bCol == 0)
+ {
+ bCol = 1;
+ aCol = aBoxItem.GetLeft()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aBoxItem.GetLeft()->GetOutWidth());
+ aLine.SetInWidth( aBoxItem.GetLeft()->GetInWidth());
+ aLine.SetDistance( aBoxItem.GetLeft()->GetDistance());
+ }
+ else
+ {
+ if(aCol != aBoxItem.GetLeft()->GetColor() )
+ bColDisable = 1;
+ if(!( aLine == *(aBoxItem.GetLeft())) )
+ bStyleDisable = 1;
+ }
+ }
+
+ if( aBoxItem.GetRight() )
+ {
+ if(bCol == 0)
+ {
+ bCol = 1;
+ aCol = aBoxItem.GetRight()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aBoxItem.GetRight()->GetOutWidth());
+ aLine.SetInWidth( aBoxItem.GetRight()->GetInWidth());
+ aLine.SetDistance( aBoxItem.GetRight()->GetDistance());
+ }
+ else
+ {
+ if(aCol != aBoxItem.GetRight()->GetColor() )
+ bColDisable = 1;
+ if(!( aLine == *(aBoxItem.GetRight())) )
+ bStyleDisable = 1;
+ }
+ }
+
+ if( aInfoItem.GetVert())
+ {
+ if(bCol == 0)
+ {
+ bCol = 1;
+ aCol = aInfoItem.GetVert()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aInfoItem.GetVert()->GetOutWidth());
+ aLine.SetInWidth( aInfoItem.GetVert()->GetInWidth());
+ aLine.SetDistance( aInfoItem.GetVert()->GetDistance());
+ }
+ else
+ {
+ if(aCol != aInfoItem.GetVert()->GetColor() )
+ bColDisable = 1;
+ if(!( aLine == *(aInfoItem.GetVert())) )
+ bStyleDisable = 1;
+ }
+ }
+
+ if( aInfoItem.GetHori())
+ {
+ if(bCol == 0)
+ {
+ bCol = 1;
+ aCol = aInfoItem.GetHori()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aInfoItem.GetHori()->GetOutWidth());
+ aLine.SetInWidth( aInfoItem.GetHori()->GetInWidth());
+ aLine.SetDistance( aInfoItem.GetHori()->GetDistance());
+ }
+ else
+ {
+ if(aCol != aInfoItem.GetHori()->GetColor() )
+ bColDisable = 1;
+ if(!( aLine == *(aInfoItem.GetHori())) )
+ bStyleDisable = 1;
+ }
+ }
+
+ if( !aInfoItem.IsValid( VALID_VERT )
+ || !aInfoItem.IsValid( VALID_HORI )
+ || !aInfoItem.IsValid( VALID_LEFT )
+ || !aInfoItem.IsValid( VALID_RIGHT )
+ || !aInfoItem.IsValid( VALID_TOP )
+ || !aInfoItem.IsValid( VALID_BOTTOM ) )
+ {
+ bColDisable = 1;
+ bStyleDisable = 1;
+ }
+
+ if(SID_FRAME_LINECOLOR == nWhich)
+ {
+ if(bColDisable) // if different lines have differernt colors
+ {
+ aCol = COL_TRANSPARENT;
+ rSet.Put( SvxColorItem(aCol, SID_FRAME_LINECOLOR ) );
+ rSet.InvalidateItem(SID_FRAME_LINECOLOR);
+ }
+ else if( bCol == 0 && bColDisable == 0) // if no line available
+ {
+ aCol = COL_AUTO;
+ rSet.Put( SvxColorItem(aCol, SID_FRAME_LINECOLOR ) );
+ }
+ else
+ rSet.Put( SvxColorItem(aCol, SID_FRAME_LINECOLOR ) );
+ }
+ else // if( nWhich == SID_FRAME_LINESTYLE)
+ {
+ if(bStyleDisable) // if have several lines but don't have same style
+ {
+ aLine.SetOutWidth( 1 );
+ aLine.SetInWidth( 0 );
+ aLine.SetDistance( 0 );
+ SvxLineItem aItem(SID_FRAME_LINESTYLE);
+ aItem.SetLine(&aLine);
+ rSet.Put( aItem );
+ rSet.InvalidateItem(SID_FRAME_LINESTYLE);
+ }
+ else // all the lines have same style or no line availavle, use initial value (0,0,0,0)
+ {
+ SvxLineItem aItem(SID_FRAME_LINESTYLE);
+ aItem.SetLine(&aLine);
+ rSet.Put( aItem );
+ }
+ }
}
break;
case SID_ATTR_BRUSH:
@@ -1722,6 +1933,13 @@ void ScFormatShell::GetAttrState( SfxIte
}
nWhich = aIter.NextWhich();
}
+
+ if(nWhich)
+ {
+ // stuff for sidebar panels
+ Invalidate(SID_ATTR_ALIGN_DEGREES);
+ Invalidate(SID_ATTR_ALIGN_STACKED);
+ }
}
//------------------------------------------------------------------
@@ -2168,3 +2386,52 @@ void ScFormatShell::StateFormatPaintbrus
rSet.Put( SfxBoolItem( SID_FORMATPAINTBRUSH, pViewData->GetView()->HasPaintBrush() ) );
}
+void ScFormatShell::ExecViewOptions( SfxRequest& rReq )
+{
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ SfxBindings& rBindings = pViewData->GetBindings();
+ const SfxItemSet* pNewAttrs = rReq.GetArgs();
+
+ if ( pNewAttrs )
+ {
+ sal_uInt16 nSlot = rReq.GetSlot();
+
+ if( nSlot == SID_SCGRIDSHOW)
+ {
+
+ ScViewData* pViewData = pTabViewShell->GetViewData();
+ const ScViewOptions& rOldOpt = pViewData->GetOptions();
+ ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current());
+ bool bState = ((const SfxBoolItem &)pNewAttrs->Get( pNewAttrs->GetPool()->GetWhich( nSlot ) )).GetValue();
+
+ if ( (bool)rOldOpt.GetOption( VOPT_GRID ) != bState)
+ {
+ ScViewOptions rNewOpt(rOldOpt);
+ rNewOpt.SetOption( VOPT_GRID, bState);
+ pViewData->SetOptions( rNewOpt );
+ pViewData->GetDocument()->SetViewOptions( rNewOpt );
+ pDocSh->SetDocumentModified();
+ //add , write the change to sc view config
+ ScModule* pScMod = SC_MOD();
+ pScMod->SetViewOptions( rNewOpt );
+ //add end
+ rBindings.Invalidate( nSlot );
+ }
+ }
+ }
+
+}
+
+void ScFormatShell::GetViewOptions( SfxItemSet& rSet )
+{
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ if( pTabViewShell )
+ {
+ ScViewOptions aViewOpt = pTabViewShell->GetViewData()->GetOptions();
+ rSet.ClearItem(SID_SCGRIDSHOW);
+ SfxBoolItem aItem( SID_SCGRIDSHOW, aViewOpt.GetOption( VOPT_GRID ) );
+ rSet.Put(aItem);
+ }
+}
+
+// eof
Modified: openoffice/branches/sidebar/main/sc/source/ui/view/tabview3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/view/tabview3.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/tabview3.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/tabview3.cxx Sat Mar 30 18:27:42 2013
@@ -239,7 +239,21 @@ void ScTabView::InvalidateAttribs()
rBindings.Invalidate( SID_ALIGNBOTTOM );
rBindings.Invalidate( SID_ALIGNCENTERVER );
- rBindings.Invalidate( SID_BACKGROUND_COLOR );
+ // stuff for sidebar panels
+ {
+ rBindings.Invalidate( SID_H_ALIGNCELL );
+ rBindings.Invalidate( SID_V_ALIGNCELL );
+ rBindings.Invalidate( SID_ATTR_ALIGN_INDENT );
+ rBindings.Invalidate( SID_FRAME_LINECOLOR );
+ rBindings.Invalidate( SID_FRAME_LINESTYLE );
+ rBindings.Invalidate( SID_ATTR_BORDER_OUTER );
+ rBindings.Invalidate( SID_ATTR_BORDER_INNER );
+ rBindings.Invalidate( SID_SCGRIDSHOW );
+ rBindings.Invalidate( SID_ATTR_BORDER_DIAG_TLBR );
+ rBindings.Invalidate( SID_ATTR_BORDER_DIAG_BLTR );
+ }
+
+ rBindings.Invalidate( SID_BACKGROUND_COLOR );
rBindings.Invalidate( SID_ATTR_ALIGN_LINEBREAK );
rBindings.Invalidate( SID_NUMBER_FORMAT );
Modified: openoffice/branches/sidebar/main/sc/source/ui/view/viewfunc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/view/viewfunc.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/viewfunc.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/viewfunc.cxx Sat Mar 30 18:27:42 2013
@@ -2868,6 +2868,11 @@ void ScViewFunc::ChangeIndent( sal_Bool
{
pDocSh->UpdateOle(pViewData);
StartFormatArea();
+
+ // stuff for sidebar panels
+ SfxBindings& rBindings = GetViewData()->GetBindings();
+ rBindings.Invalidate( SID_H_ALIGNCELL );
+ rBindings.Invalidate( SID_ATTR_ALIGN_INDENT );
}
}
Modified: openoffice/branches/sidebar/main/sc/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/util/makefile.mk?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/util/makefile.mk (original)
+++ openoffice/branches/sidebar/main/sc/util/makefile.mk Sat Mar 30 18:27:42 2013
@@ -41,6 +41,7 @@ RESLIB1LIST=\
$(SRS)$/ui.srs \
$(SRS)$/dbgui.srs \
$(SRS)$/drawfunc.srs \
+ $(SRS)$/sidebar.srs \
$(SRS)$/core.srs \
$(SRS)$/styleui.srs \
$(SRS)$/formdlgs.srs \
@@ -123,6 +124,7 @@ LIB3FILES= \
$(SLB)$/dbgui.lib \
$(SLB)$/pagedlg.lib \
$(SLB)$/drawfunc.lib \
+ $(SLB)$/sidebar.lib \
$(SLB)$/navipi.lib
LIB3FILES+= \
Modified: openoffice/branches/sidebar/main/sc/util/sc.component
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/util/sc.component?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/util/sc.component (original)
+++ openoffice/branches/sidebar/main/sc/util/sc.component Sat Mar 30 18:27:42 2013
@@ -90,4 +90,7 @@
<implementation name="stardiv.StarCalc.ScSpreadsheetSettings">
<service name="com.sun.star.sheet.GlobalSheetSettings"/>
</implementation>
+ <implementation name="org.apache.openoffice.comp.sc.sidebar.ScPanelFactory">
+ <service name="com.sun.star.ui.UIElementFactory"/>
+ </implementation>
</component>
Modified: openoffice/branches/sidebar/main/svx/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/Package_inc.mk?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/Package_inc.mk (original)
+++ openoffice/branches/sidebar/main/svx/Package_inc.mk Sat Mar 30 18:27:42 2013
@@ -556,8 +556,11 @@ $(eval $(call gb_Package_add_file,svx_in
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sidebar/ColorControl.hxx,svx/sidebar/ColorControl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sidebar/ColorPopup.hxx,svx/sidebar/ColorPopup.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sidebar/ContextChangeEventMultiplexer.hxx,svx/sidebar/ContextChangeEventMultiplexer.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sidebar/Popup.hxx,svx/sidebar/Popup.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sidebar/SidebarDialControl.hxx,svx/sidebar/SidebarDialControl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sidebar/PopupContainer.hxx,svx/sidebar/PopupContainer.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sidebar/PopupControl.hxx,svx/sidebar/PopupControl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sidebar/SelectionAnalyzer.hxx,svx/sidebar/SelectionAnalyzer.hxx))
Added: openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ColorControl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ColorControl.hxx?rev=1462835&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ColorControl.hxx (added)
+++ openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ColorControl.hxx Sat Mar 30 18:27:42 2013
@@ -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 "svx/sidebar/PopupControl.hxx"
+
+#include <svtools/valueset.hxx>
+#include <boost/function.hpp>
+
+class Window;
+class SfxBindings;
+class RedId;
+class FloatingWindow;
+
+
+namespace svx { namespace sidebar {
+
+/** The ColorControl uses a ValueSet control for displaying all named
+ colors in a matrix.
+*/
+class SVX_DLLPUBLIC ColorControl
+ : public PopupControl
+{
+public:
+ /** Create a new ColorControl object.
+ @param rControlResId
+ The resource id for the whole color control.
+ @param rColorGetter
+ A functor for setting the (default/preselected) color.
+ @param rColorSetter
+ A functor for setting the color that is selected by the
+ user.
+ @param pNoColorStringResId
+ Resource id of an optional string for the "no color"
+ string. When a value is given then a
+ field/button is created above the color matrix for
+ selecting "no color" ie. transparent.
+ When zero is given then no such field is created.
+ */
+ ColorControl (
+ Window* pParent,
+ SfxBindings* pBindings,
+ const ResId& rControlResId,
+ const ResId& rValueSetResId,
+ const ::boost::function<Color(void)>& rColorGetter,
+ const ::boost::function<void(String&,Color)>& rColorSetter,
+ FloatingWindow* pFloatingWindow,
+ const ResId* pNoColorStringResId);
+ virtual ~ColorControl (void);
+
+ void GetFocus (void);
+ void SetCurColorSelect (
+ const Color aCol,
+ const bool bAvl);
+
+private:
+ SfxBindings* mpBindings;
+ ValueSet maVSColor;
+ FloatingWindow* mpFloatingWindow;
+ const String msNoColorString;
+ ::boost::function<Color(void)> maColorGetter;
+ ::boost::function<void(String&,Color)> maColorSetter;
+
+ void FillColors (void);
+ DECL_LINK(VSSelectHdl, void *);
+};
+
+} } // end of namespace svx::sidebar
Added: openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ColorPopup.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ColorPopup.hxx?rev=1462835&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ColorPopup.hxx (added)
+++ openoffice/branches/sidebar/main/svx/inc/svx/sidebar/ColorPopup.hxx Sat Mar 30 18:27:42 2013
@@ -0,0 +1,55 @@
+/**************************************************************
+ *
+ * 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_COLOR_POPUP_HXX_
+#define _SVX_SIDEBAR_COLOR_POPUP_HXX_
+
+#include "svx/sidebar/Popup.hxx"
+
+#include <tools/color.hxx>
+
+
+namespace svx { namespace sidebar {
+
+/** Popup control that displays all named colors in a matrix.
+ The number of rows and columns of the matrix are computed from
+ the number of named colors so that both have roughly the same
+ value.
+
+ The ColorPopup uses ColorControl as control for its content.
+*/
+class SVX_DLLPUBLIC ColorPopup
+ : public Popup
+{
+public :
+ ColorPopup (
+ Window* pParent,
+ const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
+ virtual ~ColorPopup (void);
+
+ void SetCurrentColor (
+ const Color aCurrentColor,
+ const bool bIsColorAvailable);
+};
+
+} } // end of namespace svx::sidebar
+
+#endif
Added: openoffice/branches/sidebar/main/svx/inc/svx/sidebar/SidebarDialControl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/sidebar/SidebarDialControl.hxx?rev=1462835&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/sidebar/SidebarDialControl.hxx (added)
+++ openoffice/branches/sidebar/main/svx/inc/svx/sidebar/SidebarDialControl.hxx Sat Mar 30 18:27:42 2013
@@ -0,0 +1,45 @@
+/**************************************************************
+ *
+ * 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_DIAL_CONTROL_HXX
+#define SVX_SIDEBAR_DIAL_CONTROL_HXX
+
+#include <svx/dialcontrol.hxx>
+
+namespace svx { namespace sidebar {
+
+/** Provide some improvements over the standard DialControl.
+*/
+class SVX_DLLPUBLIC SidebarDialControl : public svx::DialControl
+{
+public:
+ SidebarDialControl (Window* pParent, const ResId& rResId);
+ virtual ~SidebarDialControl (void);
+
+ virtual void MouseButtonDown (const MouseEvent& rMEvt);
+
+protected:
+ virtual void HandleMouseEvent (const Point& rPos, bool bInitial);
+};
+
+} } // end of namespace svx::sidebar
+
+#endif
Modified: openoffice/branches/sidebar/main/svx/inc/svx/svdstr.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/svdstr.hrc?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/svdstr.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/svdstr.hrc Sat Mar 30 18:27:42 2013
@@ -786,8 +786,11 @@
#define SIP_SA_CROP_MARKERS (SIP_Begin + 276)
#define SIP_SA_CROP_FINE_MARKERS (SIP_Begin + 277)
#define SIP_SA_ACCESSIBILITY_CROP_MARKERS (SIP_Begin + 278)
+#define IMG_DIACONTROL_NORMAL (SIP_Begin + 279)
+#define IMG_DIACONTROL_H (SIP_Begin + 280)
-#define SIP_End (SIP_SA_ACCESSIBILITY_CROP_MARKERS)
+
+#define SIP_End (IMG_DIACONTROL_H)
#define SDR_ResourceEnd (SIP_End)
Modified: openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc Sat Mar 30 18:27:42 2013
@@ -1269,16 +1269,8 @@
#define SID_ATTR_LINE_JOINT (SID_SVX_START+1110)
#define SID_ATTR_LINE_CAP (SID_SVX_START+1111)
#define SID_ATTR_TRANSFORM_MATRIX (SID_SVX_START+1112)
-
-#define SID_CHAR_DLG_EFFECT (SID_SVX_START+1113)
-//#define SID_SVX_AREA_TRANS_TYPE (SID_SVX_START+1105)
-//#define SID_SVX_AREA_TRANSPARENCY (SID_SVX_START+1106)
-//#define SID_SVX_AREA_TRANSP_GRADIENT (SID_SVX_START+1107)
-//
-//#define SID_ATTR_LINE_TRANSPARENCE (SID_SVX_START+1108)
-//
-//#define SID_FLIP_HORIZONTAL (SID_SVX_START+1109)
-//#define SID_FLIP_VERTICAL (SID_SVX_START+1110)
+#define SID_CELL_FORMAT_BORDER (SID_SVX_START+1113)
+#define SID_CHAR_DLG_EFFECT (SID_SVX_START+1114)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
#define SID_SVX_FIRSTFREE (SID_CHAR_DLG_EFFECT + 1)
Modified: openoffice/branches/sidebar/main/svx/sdi/svx.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/sdi/svx.sdi?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/sdi/svx.sdi (original)
+++ openoffice/branches/sidebar/main/svx/sdi/svx.sdi Sat Mar 30 18:27:42 2013
@@ -15689,5 +15689,81 @@ SfxBoolItem SvxAutoHeight SID_ATTR_TRANS
GroupId = GID_SPECIAL;
]
+//----------------------------------------------------------------------
+SvxLineItem BorderTLBR SID_ATTR_BORDER_DIAG_TLBR
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
+]
+
+SvxLineItem BorderBLTR SID_ATTR_BORDER_DIAG_BLTR
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxVoidItem SCDialogBorder SID_CELL_FORMAT_BORDER
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Asynchron;
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
//--------------------------------------------------------------------------
// eof
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx Sat Mar 30 18:27:42 2013
@@ -41,7 +41,7 @@
#include <svx/svxitems.hrc>
#include <vcl/toolbox.hxx>
#include <svtools/toolbarmenu.hxx>
-#include "sidebar/ColorControl.hxx"
+#include <svx/sidebar/ColorControl.hxx>
#include <boost/bind.hpp>
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx Sat Mar 30 18:27:42 2013
@@ -22,7 +22,7 @@
#ifndef SVX_PROPERTYPANEL_AREAPAGE_HXX
#define SVX_PROPERTYPANEL_AREAPAGE_HXX
-#include "sidebar/ColorPopup.hxx"
+#include <svx/sidebar/ColorPopup.hxx>
#include "AreaTransparencyGradientPopup.hxx"
#include <vcl/ctrl.hxx>
#include <sfx2/sidebar/SidebarPanelBase.hxx>
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx Sat Mar 30 18:27:42 2013
@@ -129,3 +129,4 @@ private:
} } // end of namespace ::svx::sidebar
#endif
+// eof
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx Sat Mar 30 18:27:42 2013
@@ -53,7 +53,7 @@
#include <svx/xlinjoit.hxx>
#include "svx/sidebar/PopupContainer.hxx"
#include "svx/sidebar/PopupControl.hxx"
-#include "sidebar/ColorControl.hxx"
+#include <svx/sidebar/ColorControl.hxx>
#include "LineStyleControl.hxx"
#include "LineWidthControl.hxx"
#include <boost/bind.hpp>
@@ -927,7 +927,7 @@ PopupControl* LinePropertyPanel::CreateC
::boost::bind(GetTransparentColor),
::boost::bind(&LinePropertyPanel::SetColor, this, _1, _2),
pParent,
- STR_AUTOMATICE);
+ &SVX_RES(STR_AUTOMATICE));
}
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.hxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.hxx Sat Mar 30 18:27:42 2013
@@ -31,7 +31,7 @@
#include <vcl/field.hxx>
#include <boost/scoped_ptr.hpp>
#include <boost/scoped_array.hpp>
-#include "sidebar/ColorPopup.hxx"
+#include <svx/sidebar/ColorPopup.hxx>
#include "LineStylePopup.hxx"
#include "LineWidthPopup.hxx"
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.src?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.src (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.src Sat Mar 30 18:27:42 2013
@@ -438,7 +438,9 @@ Control RID_POPUPPANEL_LINEPAGE_STYLE
DialogControl = TRUE;
Border = FALSE;
- Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH , 13 + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE);
+ Size = MAP_APPFONT(
+ POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH ,
+ 13 + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE);
Control VS_STYLE
{
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleControl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleControl.hxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleControl.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleControl.hxx Sat Mar 30 18:27:42 2013
@@ -19,6 +19,9 @@
*
*************************************************************/
+#ifndef SVX_SIDEBAR_LINE_STYLE_CONTROL_HXX
+#define SVX_SIDEBAR_LINE_STYLE_CONTROL_HXX
+
#include "svx/sidebar/PopupControl.hxx"
#include <vcl/button.hxx>
#include "LineStyleValueSet.hxx"
@@ -65,3 +68,7 @@ private:
};
} } // end of namespace svx::sidebar
+
+#endif // SVX_SIDEBAR_LINE_STYLE_CONTROL_HXX
+
+// eof
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleValueSet.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleValueSet.hxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleValueSet.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleValueSet.hxx Sat Mar 30 18:27:42 2013
@@ -18,6 +18,10 @@
* under the License.
*
*************************************************************/
+
+#ifndef SVX_SIDEBAR_LINE_STYLE_VALUE_SET_HXX
+#define SVX_SIDEBAR_LINE_STYLE_VALUE_SET_HXX
+
/*
#include <sfx2/sidebar/propertypanel.hrc>
#include <sfx2/sidebar/Theme.hxx>
@@ -75,3 +79,7 @@ private:
};
} } // end of namespace svx::sidebar
+
+#endif
+
+// eof
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/line/LineWidthValueSet.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LineWidthValueSet.hxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/line/LineWidthValueSet.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/line/LineWidthValueSet.hxx Sat Mar 30 18:27:42 2013
@@ -19,11 +19,12 @@
*
*************************************************************/
-#include <svtools/valueset.hxx>
+#ifndef SVX_SIDEBAR_LINE_WIDTH_VALUE_SET_HXX
+#define SVX_SIDEBAR_LINE_WIDTH_VALUE_SET_HXX
+#include <svtools/valueset.hxx>
#include <vcl/image.hxx>
-
namespace svx { namespace sidebar {
class LineWidthValueSet
@@ -50,3 +51,7 @@ protected:
};
} } // end of namespace svx::sidebar
+
+#endif // SVX_SIDEBAR_LINE_WIDTH_VALUE_SET_HXX
+
+// eof
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx Sat Mar 30 18:27:42 2013
@@ -24,7 +24,7 @@
#include <sfx2/sidebar/ControlFactory.hxx>
#include "PosSizePropertyPanel.hxx"
#include "PosSizePropertyPanel.hrc"
-#include "SidebarDialControl.hxx"
+#include <svx/sidebar/SidebarDialControl.hxx>
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
#include <sfx2/dispatch.hxx>
@@ -180,7 +180,9 @@ void PosSizePropertyPanel::Initialize()
mpMtrWidth->SetAccessibleRelationLabeledBy(mpFtWidth.get());
mpMtrHeight->SetAccessibleRelationLabeledBy(mpFtHeight.get());
mpMtrAngle->SetAccessibleRelationLabeledBy(mpFtAngle.get());
- //mpMtrAngle->SetMpSubEditAccLableBy(mpFtAngle.get());
+#ifdef HAS_IA2
+ mpMtrAngle->SetMpSubEditAccLableBy(mpFtAngle.get());
+#endif
mpFlipTbx->SetAccessibleRelationLabeledBy(mpFtFlip.get());
mpMtrAngle->InsertValue(0, FUNIT_CUSTOM);
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.hrc?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.hrc (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.hrc Sat Mar 30 18:27:42 2013
@@ -43,9 +43,6 @@
#define STR_QH_HORI_FLIP 23
#define STR_QH_VERT_FLIP 24
-#define IMG_DIACONTROL_NORMAL 25
-#define IMG_DIACONTROL_H 26
-
#define MBOX_WIDTH 50
#define TEXT_WIDTH 40
#define FLIP_BUTTON_SIZE 13
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.src?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.src (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.src Sat Mar 30 18:27:42 2013
@@ -222,15 +222,6 @@ Control RID_SIDEBAR_POSSIZE_PANEL
Size = MAP_PIXEL( 50, 50 );
HelpID = HID_PROPERTY_PANEL_POSIZE_DIAL_CONTROL;
};
-
- Image IMG_DIACONTROL_NORMAL
- {
- ImageBitmap = Bitmap{File = "rotation.png";};
- };
- Image IMG_DIACONTROL_H
- {
- ImageBitmap = Bitmap{File = "rotation_h.png";};
- };
};
// eof
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControl.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControl.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControl.cxx Sat Mar 30 18:27:42 2013
@@ -19,7 +19,7 @@
*
*************************************************************/
-#include "SidebarDialControl.hxx"
+#include <svx/sidebar/SidebarDialControl.hxx>
#include "SidebarDialControlBmp.hxx"
#include <vcl/svapp.hxx>
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.cxx Sat Mar 30 18:27:42 2013
@@ -28,7 +28,7 @@
#include "PosSizePropertyPanel.hrc"
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
-
+#include <svx/svdstr.hrc>
namespace svx { namespace sidebar {
@@ -77,15 +77,15 @@ void SidebarDialControlBmp::DrawBackgrou
SetFillColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground));
DrawRect(maRect);
- const Image aImage (
+ const BitmapEx aBitmapEx(
sfx2::sidebar::Theme::IsHighContrastMode()
? SVX_RES(IMG_DIACONTROL_H)
: SVX_RES(IMG_DIACONTROL_NORMAL));
- Size aImageSize (aImage.GetSizePixel());
+ // Size aImageSize(aBitmapEx.GetSizePixel());
// aImageSize.Width() -= 1;
// aImageSize.Height() -= 1;
SetAntialiasing(ANTIALIASING_ENABLE_B2DDRAW | ANTIALIASING_PIXELSNAPHAIRLINE);
- DrawImage(maRect.TopLeft(), aImageSize, aImage);
+ DrawBitmapEx(maRect.TopLeft(), /*aImageSize,*/ aBitmapEx);
}
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx Sat Mar 30 18:27:42 2013
@@ -56,8 +56,8 @@
#include "TextCharacterSpacingPopup.hxx"
#include "TextUnderlineControl.hxx"
#include "TextUnderlinePopup.hxx"
-#include "sidebar/ColorControl.hxx"
-#include "svx/sidebar/PopupContainer.hxx"
+#include <svx/sidebar/ColorControl.hxx>
+#include <svx/sidebar/PopupContainer.hxx>
#include <boost/bind.hpp>
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx Sat Mar 30 18:27:42 2013
@@ -37,7 +37,7 @@
#include <boost/scoped_ptr.hpp>
#include "TextCharacterSpacingPopup.hxx"
#include "TextUnderlinePopup.hxx"
-#include "sidebar/ColorPopup.hxx"
+#include <svx/sidebar/ColorPopup.hxx>
#include <vcl/vclenum.hxx>
class FloatingWindow;
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/tools/ColorControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/tools/ColorControl.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/tools/ColorControl.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/tools/ColorControl.cxx Sat Mar 30 18:27:42 2013
@@ -21,7 +21,7 @@
#include "precompiled_svx.hxx"
-#include "sidebar/ColorControl.hxx"
+#include <svx/sidebar/ColorControl.hxx>
#include "svx/svxids.hrc"
#include "svx/drawitem.hxx"
#include "svx/xtable.hxx"
@@ -96,14 +96,14 @@ ColorControl::ColorControl (
const ::boost::function<Color(void)>& rColorGetter,
const ::boost::function<void(String&,Color)>& rColorSetter,
FloatingWindow* pFloatingWindow,
- const sal_uInt32 nNoColorStringResId)
+ const ResId* pNoColorStringResId) // const sal_uInt32 nNoColorStringResId)
: PopupControl(pParent, rControlResId),
mpBindings(pBindings),
maVSColor(this, rValueSetResId),
mpFloatingWindow(pFloatingWindow),
msNoColorString(
- nNoColorStringResId>0
- ? String(SVX_RES(nNoColorStringResId))
+ pNoColorStringResId
+ ? String(*pNoColorStringResId)
: String()),
maColorGetter(rColorGetter),
maColorSetter(rColorSetter)
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/tools/ColorPopup.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/tools/ColorPopup.cxx?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/tools/ColorPopup.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/tools/ColorPopup.cxx Sat Mar 30 18:27:42 2013
@@ -19,8 +19,8 @@
*
*************************************************************/
-#include "sidebar/ColorPopup.hxx"
-#include "sidebar/ColorControl.hxx"
+#include <svx/sidebar/ColorPopup.hxx>
+#include <svx/sidebar/ColorControl.hxx>
namespace svx { namespace sidebar {
Modified: openoffice/branches/sidebar/main/svx/source/svdraw/svdstr.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/svdraw/svdstr.src?rev=1462835&r1=1462834&r2=1462835&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/svdraw/svdstr.src (original)
+++ openoffice/branches/sidebar/main/svx/source/svdraw/svdstr.src Sat Mar 30 18:27:42 2013
@@ -2875,6 +2875,16 @@ Bitmap SIP_SA_ACCESSIBILITY_CROP_MARKERS
File = "cropmarkersACC.bmp";
};
+// DialControl bitmaps
+Bitmap IMG_DIACONTROL_NORMAL
+{
+ File = "rotation.png";
+};
+Bitmap IMG_DIACONTROL_H
+{
+ File = "rotation_h.png";
+};
+
//IAccessibility2 Implementation 2009-----
String STR_ObjNameSingulFONTWORK
{