From 53a3a31cf14ac35345c58553bc259130e1e70711 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 16 Dec 2013 10:36:06 +0000
Subject: move this QueryFolderName into fpicker

Change-Id: I1b7b26ceef86e0dcc642d760b8413a822c125a2b
---
 fpicker/source/office/QueryFolderName.hxx | 46 +++++++++++++++++++++++++++++++
 fpicker/source/office/iodlg.cxx           | 10 ++-----
 2 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 fpicker/source/office/QueryFolderName.hxx

(limited to 'fpicker')

diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx
new file mode 100644
index 000000000000..2984f35b4447
--- /dev/null
+++ b/fpicker/source/office/QueryFolderName.hxx
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INCLUDED_QUERYFOLDERNAME_HXX
+#define INCLUDED_QUERYFOLDERNAME_HXX
+
+#include <vcl/fixed.hxx>
+#include <vcl/button.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/layout.hxx>
+
+class QueryFolderNameDialog : public ModalDialog
+{
+private:
+    Edit*     m_pNameEdit;
+    VclFrame* m_pNameLine;
+    OKButton* m_pOKBtn;
+
+    DECL_LINK( OKHdl, void * );
+    DECL_LINK( NameHdl, void * );
+
+public:
+    QueryFolderNameDialog(Window* _pParent, const OUString& rTitle,
+        const OUString& rDefaultText, OUString* pGroupName = NULL);
+    OUString GetName() const { return m_pNameEdit->GetText(); }
+};
+
+#endif // INCLUDED_QUERYFOLDERNAME_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index face054e63e9..0e5b4679d2a9 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -49,7 +49,7 @@
 #include "iodlgimp.hxx"
 #include "svtools/inettbc.hxx"
 #include "unotools/syslocale.hxx"
-#include "svtools/QueryFolderName.hxx"
+#include "QueryFolderName.hxx"
 #include <rtl/ustring.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
@@ -773,7 +773,7 @@ IMPL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, EMPTYARG )
     SmartContent aContent( pThis->_pFileView->GetViewURL( ) );
     OUString aTitle;
     aContent.getTitle( aTitle );
-    svtools::QueryFolderNameDialog aDlg( pThis, aTitle, SVT_RESSTR(STR_SVT_NEW_FOLDER) );
+    QueryFolderNameDialog aDlg( pThis, aTitle, SVT_RESSTR(STR_SVT_NEW_FOLDER) );
     sal_Bool bHandled = sal_False;
 
     while ( !bHandled )
@@ -3332,10 +3332,6 @@ IMPL_LINK_NOARG( SvtFileDialog, Split_Hdl )
     return 0;
 }
 
-// QueryFolderNameDialog -------------------------------------------------------
-
-namespace svtools {
-
 QueryFolderNameDialog::QueryFolderNameDialog(Window* _pParent,
     const OUString& rTitle, const OUString& rDefaultText, OUString* pGroupName)
     : ModalDialog(_pParent, "FolderNameDialog", "fps/ui/foldernamedialog.ui")
@@ -3382,6 +3378,4 @@ IMPL_LINK_NOARG(QueryFolderNameDialog, NameHdl)
     return 0;
 }
 
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit