summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRachit Gupta <rachitgupta1792@gmail.com>2014-05-19 19:56:44 +0530
committerRachit Gupta <rachitgupta1792@gmail.com>2014-05-21 18:35:52 +0530
commit584010c43d2f1bc38e6f0419e1493290d538cbcb (patch)
treeda01cc3bc61180f3fda06a64a2e5cf6cb0514701
parentChanged license and added #ifdef. (diff)
downloadcore-584010c43d2f1bc38e6f0419e1493290d538cbcb.tar.gz
core-584010c43d2f1bc38e6f0419e1493290d538cbcb.zip
Moved definition of SelectPersonaDialog to personalization.hxx
Change-Id: Ic6ffcfb394e36d4d9ce9825b26095fe2a0f34fdd
-rw-r--r--cui/source/options/personalization.cxx26
-rw-r--r--cui/source/options/personalization.hxx23
-rw-r--r--cui/source/options/personasdochandler.cxx10
3 files changed, 24 insertions, 35 deletions
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index cb318a371487..a46b7b2ae642 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -21,6 +21,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/graphicfilter.hxx>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
@@ -31,28 +32,6 @@ using namespace com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
-
-/** Dialog that will allow the user to choose a Persona to use.
-
-So far there is no better possibility than just to paste the URL from
-https://addons.mozilla.org/firefox/themes ...
-*/
-class SelectPersonaDialog : public ModalDialog
-{
-private:
- Edit *m_pEdit; ///< The input line for the Persona URL
-
-public:
- SelectPersonaDialog( Window *pParent );
-
- /// Get the URL from the Edit field.
- OUString GetPersonaURL() const;
-
-private:
- /// Handle the [Visit Firefox Personas] button
- DECL_LINK( VisitPersonas, PushButton* );
-};
-
SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
: ModalDialog( pParent, "SelectPersonaDialog", "cui/ui/select_persona_dialog.ui" )
{
@@ -76,9 +55,6 @@ OUString SelectPersonaDialog::GetPersonaURL() const
IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
{
- // uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShell( com::sun::star::system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) );
-
- // xSystemShell->execute( "https://addons.mozilla.org/firefox/themes/", OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext);
PersonasDocHandler* pHandler = new PersonasDocHandler();
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 40661f83e98a..9190eb208189 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -48,6 +48,29 @@ private:
bool CopyPersonaToGallery( const OUString &rURL );
};
+/** Dialog that will allow the user to choose a Persona to use.
+
+So far there is no better possibility than just to paste the URL from
+https://addons.mozilla.org/firefox/themes ...
+*/
+class SelectPersonaDialog : public ModalDialog
+{
+private:
+ Edit *m_pEdit; ///< The input line for the Persona URL
+
+public:
+ SelectPersonaDialog( Window *pParent );
+
+ /// Get the URL from the Edit field.
+ OUString GetPersonaURL() const;
+
+private:
+ /// Handle the [Visit Firefox Personas] button
+ DECL_LINK( VisitPersonas, PushButton* );
+};
+
+
+
#endif // INCLUDED_CUI_SOURCE_OPTIONS_PERSONALIZATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/personasdochandler.cxx b/cui/source/options/personasdochandler.cxx
index 9b0e0346dda4..521b561bca70 100644
--- a/cui/source/options/personasdochandler.cxx
+++ b/cui/source/options/personasdochandler.cxx
@@ -5,16 +5,6 @@
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "personasdochandler.hxx"