You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/05/03 16:19:33 UTC
svn commit: r1478806 - in /openoffice/trunk/main/sfx2:
inc/sfx2/sidebar/CommandInfoProvider.hxx
inc/sfx2/sidebar/ResourceDefinitions.hrc inc/sfx2/sidebar/Tools.hxx
source/sidebar/CommandInfoProvider.hxx source/sidebar/Tools.hxx
Author: af
Date: Fri May 3 14:19:32 2013
New Revision: 1478806
URL: http://svn.apache.org/r1478806
Log:
122218: Added missing files to sfx2/inc/sfx2/sidebar.
Added:
openoffice/trunk/main/sfx2/inc/sfx2/sidebar/CommandInfoProvider.hxx (with props)
openoffice/trunk/main/sfx2/inc/sfx2/sidebar/Tools.hxx (with props)
Removed:
openoffice/trunk/main/sfx2/source/sidebar/CommandInfoProvider.hxx
openoffice/trunk/main/sfx2/source/sidebar/Tools.hxx
Modified:
openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc
Added: openoffice/trunk/main/sfx2/inc/sfx2/sidebar/CommandInfoProvider.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/inc/sfx2/sidebar/CommandInfoProvider.hxx?rev=1478806&view=auto
==============================================================================
--- openoffice/trunk/main/sfx2/inc/sfx2/sidebar/CommandInfoProvider.hxx (added)
+++ openoffice/trunk/main/sfx2/inc/sfx2/sidebar/CommandInfoProvider.hxx Fri May 3 14:19:32 2013
@@ -0,0 +1,98 @@
+/**************************************************************
+ *
+ * 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 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>
+
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+namespace sfx2 { namespace sidebar {
+
+/** Provide information about UNO commands like tooltip text with
+ keyboard accelerator.
+*/
+class SFX2_DLLPUBLIC CommandInfoProvider
+{
+public:
+ /** Return the singleton instance.
+
+ It caches some objects for the last XFrame object given to
+ GetLabelForCommand. These objects are release and created new
+ when that method is called with a different XFrame from the
+ last call.
+
+ Lifetime control should work but could be more elegant.
+ */
+ static CommandInfoProvider& Instance (void);
+
+ /** Return a label for the given command.
+ @param rsCommandName
+ The command name is expected to start with .uno:
+ @param rxFrame
+ The frame is used to identify the module and document.
+ @return
+ The returned label contains the keyboard accelerator, if
+ one is defined.
+ */
+ ::rtl::OUString GetLabelForCommand (
+ const ::rtl::OUString& rsCommandName,
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
+
+ /** Do not call. Should be part of a local and hidden interface.
+ */
+ void SetFrame (const cssu::Reference<css::frame::XFrame>& rxFrame);
+
+ private:
+ cssu::Reference<css::lang::XMultiServiceFactory> mxServiceFactory;
+ cssu::Reference<css::frame::XFrame> mxCachedDataFrame;
+ cssu::Reference<css::ui::XAcceleratorConfiguration> mxCachedDocumentAcceleratorConfiguration;
+ cssu::Reference<css::ui::XAcceleratorConfiguration> mxCachedModuleAcceleratorConfiguration;
+ cssu::Reference<css::ui::XAcceleratorConfiguration> mxCachedGlobalAcceleratorConfiguration;
+ ::rtl::OUString msCachedModuleIdentifier;
+ cssu::Reference<css::lang::XComponent> mxFrameListener;
+
+ CommandInfoProvider (void);
+ ~CommandInfoProvider (void);
+
+ cssu::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration (void);
+ cssu::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration (void);
+ cssu::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(void);
+ ::rtl::OUString GetModuleIdentifier (void);
+ ::rtl::OUString GetCommandShortcut (const ::rtl::OUString& rCommandName);
+ cssu::Sequence<css::beans::PropertyValue> GetCommandProperties (
+ const ::rtl::OUString& rsCommandName);
+ ::rtl::OUString GetCommandLabel (const ::rtl::OUString& rsCommandName);
+ rtl::OUString RetrieveShortcutsFromConfiguration(
+ const cssu::Reference<css::ui::XAcceleratorConfiguration>& rxConfiguration,
+ const rtl::OUString& rsCommandName);
+};
+
+} } // end of namespace sfx2/framework
+
+#endif
Propchange: openoffice/trunk/main/sfx2/inc/sfx2/sidebar/CommandInfoProvider.hxx
------------------------------------------------------------------------------
svn:executable = *
Modified: openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc?rev=1478806&r1=1478805&r2=1478806&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc (original)
+++ openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc Fri May 3 14:19:32 2013
@@ -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.
-*
-*************************************************************/
+ *
+ * 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
+#ifndef _SFX_SIDEBAR_RESOURCE_DEFINITIONS_HRC
+#define _SFX_SIDEBAR_RESOURCE_DEFINITIONS_HRC
#include <sfx2/sfx.hrc>
Added: openoffice/trunk/main/sfx2/inc/sfx2/sidebar/Tools.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/inc/sfx2/sidebar/Tools.hxx?rev=1478806&view=auto
==============================================================================
--- openoffice/trunk/main/sfx2/inc/sfx2/sidebar/Tools.hxx (added)
+++ openoffice/trunk/main/sfx2/inc/sfx2/sidebar/Tools.hxx Fri May 3 14:19:32 2013
@@ -0,0 +1,70 @@
+/**************************************************************
+ *
+ * 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_TOOLS_HXX
+#define SFX_SIDEBAR_TOOLS_HXX
+
+#include <vcl/image.hxx>
+#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>
+
+
+#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)))
+#define S2A(s) rtl::OUStringToOString(s, RTL_TEXTENCODING_ASCII_US).getStr()
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+
+namespace sfx2 { namespace sidebar {
+
+class SFX2_DLLPUBLIC Tools
+{
+public:
+ static Image GetImage (
+ const ::rtl::OUString& rsImageURL,
+ const ::rtl::OUString& rsHighContrastImageURL,
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
+
+ static Image GetImage (
+ const ::rtl::OUString& rsURL,
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
+
+ static css::awt::Gradient VclToAwtGradient (const Gradient aGradient);
+ 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);
+};
+
+
+} } // end of namespace sfx2::sidebar
+
+#endif
Propchange: openoffice/trunk/main/sfx2/inc/sfx2/sidebar/Tools.hxx
------------------------------------------------------------------------------
svn:executable = *