move this QueryFolderName into fpicker

Change-Id: I1b7b26ceef86e0dcc642d760b8413a822c125a2b

include/svtools/QueryFolderName.hxx → fpicker/source/office/QueryFolderName.hxx

@@ -16,8 +16,8 @@
  *   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_SVTOOLS_QUERYFOLDERNAME_HXX
-#define INCLUDED_SVTOOLS_QUERYFOLDERNAME_HXX
+#ifndef INCLUDED_QUERYFOLDERNAME_HXX
+#define INCLUDED_QUERYFOLDERNAME_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
@@ -25,13 +25,6 @@
 #include <vcl/dialog.hxx>
 #include <vcl/layout.hxx>
 
-//-------------------------------------------------------------------------
-namespace svtools {
-
-//-------------------------------------------------------------------------
-// QueryFolderNameDialog
-//-------------------------------------------------------------------------
-
 class QueryFolderNameDialog : public ModalDialog
 {
 private:
@@ -48,7 +41,6 @@ public:
     OUString GetName() const { return m_pNameEdit->GetText(); }
 };
 
-}
-#endif // INCLUDED_SVTOOLS_QUERYFOLDERNAME_HXX
+#endif // INCLUDED_QUERYFOLDERNAME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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: */