summaryrefslogtreecommitdiff
path: root/sw/source/ui/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/dialog')
-rw-r--r--sw/source/ui/dialog/dialog.src30
-rw-r--r--sw/source/ui/dialog/macassgn.cxx1
-rw-r--r--sw/source/ui/dialog/swdialmgr.cxx40
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx4
-rw-r--r--sw/source/ui/dialog/swuiexp.cxx3
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx3
6 files changed, 3 insertions, 78 deletions
diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src
deleted file mode 100644
index d30bcf8d73fb..000000000000
--- a/sw/source/ui/dialog/dialog.src
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- 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 .
- */
-#include "dialog.hrc"
-
-String STR_QUERY_SPELL_CONTINUE
-{
- Text [ en-US ] = "Continue checking at beginning of document?" ;
-};
-String STR_SPELLING_COMPLETED
-{
- Text [ en-US ] = "The spellcheck is complete." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 0a38fa43b0b9..ebfcae266a42 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -31,6 +31,7 @@
#include "swevent.hxx"
#include "docsh.hxx"
#include "globals.hrc"
+#include "strings.hrc"
#include "view.hxx"
#include <sfx2/viewfrm.hxx>
diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx
deleted file mode 100644
index d9c86575cb6e..000000000000
--- a/sw/source/ui/dialog/swdialmgr.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- 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 .
- */
-
-#include "dialmgr.hxx"
-#include "swtypes.hxx"
-#include <tools/resmgr.hxx>
-
-#ifndef DISABLE_DYNLOADING
-ResMgr* pSwResMgr=nullptr;
-#else
-static ResMgr *pSwResMgr;
-#endif
-
-ResMgr* SwDialogsResMgr::GetResMgr()
-{
- if ( !pSwResMgr )
- {
- pSwResMgr = ResMgr::CreateResMgr( "sw" );
- }
-
- return pSwResMgr;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 0840530fe608..06572ad3df92 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -28,10 +28,8 @@
#include "dbui.hrc"
#include "globals.hrc"
#include "fldui.hrc"
-#include "envelp.hrc"
-#include "dochdl.hrc"
+#include "strings.hrc"
#include <index.hrc>
-#include <../../uibase/dialog/regionsw.hrc>
#include <wordcountdialog.hxx>
#include "abstract.hxx"
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index b53ee82b5921..a54748b0c9ef 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -23,7 +23,6 @@
#include "ascfldlg.hxx"
#include "break.hxx"
#include "convert.hxx"
-#include "dialmgr.hxx"
#include "dbinsdlg.hxx"
#include "DropDownFieldDialog.hxx"
#include "fldtdlg.hxx"
@@ -53,8 +52,6 @@ namespace swui
{
if ( !pFactory )
pFactory = new SwAbstractDialogFactory_Impl;
- if ( !pSwResMgr)
- SwDialogsResMgr::GetResMgr();
return pFactory;
}
}
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index e04571585bd9..1aa953548264 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -54,8 +54,7 @@
#include <helpid.h>
#include <cmdid.h>
-#include <../../uibase/dialog/regionsw.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <globals.hrc>
#include "bitmaps.hlst"
#include <sfx2/bindings.hxx>