[Libreoffice-commits] core.git: 4 commits - include/vcl l10ntools/source padmin/AllLangResTarget_spa.mk padmin/Library_spa.mk padmin/Makefile padmin/Module_padmin.mk padmin/README padmin/source padmin/uiconfig padmin/UIConfig_spa.mk RepositoryModule_host.mk scp2/source vcl/generic vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/source vcl/uiconfig vcl/UIConfig_vcl.mk vcl/unx
Caolán McNamara
caolanm at redhat.com
Fri Mar 21 04:23:35 PDT 2014
RepositoryModule_host.mk | 1
include/vcl/printerinfomanager.hxx | 4
l10ntools/source/localize.cxx | 1
padmin/AllLangResTarget_spa.mk | 35 -
padmin/Library_spa.mk | 65 --
padmin/Makefile | 7
padmin/Module_padmin.mk | 36 -
padmin/README | 1
padmin/UIConfig_spa.mk | 19
padmin/source/helper.cxx | 112 ----
padmin/source/helper.hxx | 63 --
padmin/source/prtsetup.cxx | 564 -------------------------
padmin/source/prtsetup.hxx | 133 -----
padmin/source/rtsetup.hrc | 38 -
padmin/source/rtsetup.src | 89 ---
padmin/uiconfig/ui/printerdevicepage.ui | 209 ---------
padmin/uiconfig/ui/printerpaperpage.ui | 134 -----
padmin/uiconfig/ui/printerpropertiesdialog.ui | 104 ----
padmin/uiconfig/ui/querydialog.ui | 109 ----
scp2/source/ooo/common_brand.scp | 10
scp2/source/ooo/file_ooo.scp | 6
scp2/source/ooo/file_resource_ooo.scp | 6
scp2/source/ooo/module_hidden_ooo.scp | 3
scp2/source/ooo/module_lang_template.scp | 3
vcl/Library_vcl.mk | 10
vcl/Library_vclplug_gen.mk | 1
vcl/UIConfig_vcl.mk | 5
vcl/generic/print/genprnpsp.cxx | 115 ++---
vcl/generic/print/prtsetup.cxx | 487 +++++++++++++++++++++
vcl/generic/print/prtsetup.hxx | 129 +++++
vcl/inc/cupsmgr.hxx | 2
vcl/inc/svids.hrc | 2
vcl/source/src/print.src | 10
vcl/uiconfig/ui/cupspassworddialog.ui | 155 ++++++
vcl/uiconfig/ui/printerdevicepage.ui | 209 +++++++++
vcl/uiconfig/ui/printerpaperpage.ui | 134 +++++
vcl/uiconfig/ui/printerpropertiesdialog.ui | 104 ++++
vcl/uiconfig/ui/querydialog.ui | 109 ++++
vcl/unx/generic/printer/cupsmgr.cxx | 92 +++-
vcl/unx/generic/printer/printerinfomanager.cxx | 8
40 files changed, 1484 insertions(+), 1840 deletions(-)
New commits:
commit 1d81ca98f8d10431ea69eef71d8f633c27648743
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 21 10:03:06 2014 +0000
move remaining padmin dialogs into vcl
and so padmin is no more
Change-Id: I554cefa8b38581daad8a78bafa167448b0a0ef61
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 29670f7..88119fc 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -82,7 +82,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
oovbaapi \
oox \
package \
- padmin \
postprocess \
psprint_config \
$(call gb_Helper_optional,PYUNO,pyuno) \
diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx
index 5ccd366..9c867c7 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -154,7 +154,7 @@ public:
// printer discovery to finish
virtual bool checkPrintersChanged( bool bWait );
- // members for administration (->padmin)
+ // members for administration
// add a named printer
// addPrinter fails if a printer with the same name already exists
@@ -176,7 +176,7 @@ public:
// fails if the specified printer does not exist
virtual bool setDefaultPrinter( const OUString& rPrinterName );
- // primarily used internally but also by padmin
+ // primarily used internally
// returns the printer queue names
virtual const std::list< SystemPrintQueue >& getSystemPrintQueues();
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 659f689..0158930 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -289,7 +289,6 @@ bool includeProject(const OString& rProject) {
"mysqlc",
"nlpsolver",
"officecfg",
- "padmin",
"readlicense_oo",
"reportbuilder",
"reportdesign",
diff --git a/padmin/AllLangResTarget_spa.mk b/padmin/AllLangResTarget_spa.mk
deleted file mode 100644
index 31d2608..0000000
--- a/padmin/AllLangResTarget_spa.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,spa))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,spa,padmin))
-
-$(eval $(call gb_AllLangResTarget_add_srs,spa,\
- padmin/source \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,padmin/source))
-
-$(eval $(call gb_SrsTarget_add_files,padmin/source,\
- padmin/source/rtsetup.src \
-))
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk
deleted file mode 100644
index 57961cd..0000000
--- a/padmin/Library_spa.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 .
-#
-
-$(eval $(call gb_Library_Library,spa))
-
-$(eval $(call gb_Library_add_defs,spa,\
- -DSPA_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_external,spa,boost_headers))
-
-$(eval $(call gb_Library_use_custom_headers,spa,\
- officecfg/registry \
-))
-
-$(eval $(call gb_Library_use_sdk_api,spa))
-
-$(eval $(call gb_Library_use_libraries,spa,\
- svt \
- vcl \
- utl \
- tl \
- basegfx \
- comphelper \
- i18nlangtag \
- cppu \
- sal \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,spa,\
- padmin/source/helper \
- padmin/source/prtsetup \
-))
-
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
-$(eval $(call gb_Library_add_libs,spa,\
- -lm \
- -lpthread \
-))
-endif
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,spa,\
- -ldl \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/padmin/Makefile b/padmin/Makefile
deleted file mode 100644
index ccb1c85..0000000
--- a/padmin/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk
deleted file mode 100644
index 6ea23d9..0000000
--- a/padmin/Module_padmin.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 .
-#
-
-
-$(eval $(call gb_Module_Module,padmin))
-
-ifeq ($(GUIBASE),unx)
-
-$(eval $(call gb_Module_add_targets,padmin,\
- Library_spa \
-))
-
-$(eval $(call gb_Module_add_l10n_targets,padmin,\
- AllLangResTarget_spa \
- UIConfig_spa \
-))
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/padmin/README b/padmin/README
deleted file mode 100644
index 9b011ef..0000000
--- a/padmin/README
+++ /dev/null
@@ -1 +0,0 @@
-Printer administration dialog - used lpr - obsolete with CUPS and fontconfig, but still used for some things.
diff --git a/padmin/UIConfig_spa.mk b/padmin/UIConfig_spa.mk
deleted file mode 100644
index 565f0cc..0000000
--- a/padmin/UIConfig_spa.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_UIConfig_UIConfig,spa))
-
-$(eval $(call gb_UIConfig_add_uifiles,spa,\
- padmin/uiconfig/ui/printerdevicepage \
- padmin/uiconfig/ui/printerpaperpage \
- padmin/uiconfig/ui/printerpropertiesdialog \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
deleted file mode 100644
index da9fcab..0000000
--- a/padmin/source/helper.cxx
+++ /dev/null
@@ -1,78 +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 <unistd.h>
-#include <helper.hxx>
-#include <osl/file.hxx>
-#include <tools/urlobj.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/settings.hxx>
-#include <tools/config.hxx>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
-#include <com/sun/star/ui/dialogs/XControlAccess.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/string.hxx>
-#include <unotools/confignode.hxx>
-#include <i18nlangtag/mslangid.hxx>
-#include <rtl/ustrbuf.hxx>
-
-
-using namespace osl;
-using namespace padmin;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::ui::dialogs;
-
-
-/*
- * PaResId
- */
-
-ResId padmin::PaResId( sal_uInt32 nId )
-{
- static ResMgr* pPaResMgr = NULL;
- if( ! pPaResMgr )
- {
- LanguageTag aLanguageTag( LANGUAGE_SYSTEM);
-
- utl::OConfigurationNode aNode =
- utl::OConfigurationTreeRoot::tryCreateWithComponentContext(
- comphelper::getProcessComponentContext(),
- OUString("org.openoffice.Setup/L10N") );
- if ( aNode.isValid() )
- {
- OUString aLoc;
- Any aValue = aNode.getNodeValue( OUString("ooLocale") );
- if( aValue >>= aLoc )
- {
- aLanguageTag.reset( aLoc);
- }
- }
- pPaResMgr = ResMgr::SearchCreateResMgr( "spa", aLanguageTag );
- AllSettings aSettings = Application::GetSettings();
- aSettings.SetUILanguageTag( aLanguageTag );
- Application::SetSettings( aSettings );
- }
- return ResId( nId, *pPaResMgr );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
deleted file mode 100644
index b7b8fb8..0000000
--- a/padmin/source/helper.hxx
+++ /dev/null
@@ -1,46 +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 .
- */
-
-#ifndef _PAD_HELPER_HXX_
-#define _PAD_HELPER_HXX_
-
-#include <list>
-#include <rtl/ustring.hxx>
-#include <tools/resid.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/combobox.hxx>
-
-#if defined SPA_DLLIMPLEMENTATION
-#define SPA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define SPA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-namespace padmin
-{
-ResId PaResId( sal_uInt32 nId );
-} // namespace padmin
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc
deleted file mode 100644
index f5f0f69..0000000
--- a/padmin/source/rtsetup.hrc
+++ /dev/null
@@ -1,27 +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 .
- */
-
-#ifndef _PAD_RTSETUP_HRC_
-#define _PAD_RTSETUP_HRC_
-
-#define RID_RTS_RTSDIALOG_INVALID_TXT 4001
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
deleted file mode 100644
index 383aead..0000000
--- a/padmin/source/rtsetup.src
+++ /dev/null
@@ -1,27 +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 "rtsetup.hrc"
-
-String RID_RTS_RTSDIALOG_INVALID_TXT
-{
- Text [ en-US ] = "<ignore>";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e731d8f..323289d 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -56,7 +56,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Bin_Soffice,
gid_Brand_File_Bin_Soffice_Bin,
gid_Brand_File_Bin_Soffice_Bin_Manifest,
- gid_Brand_File_Bin_Spadmin,
gid_Brand_File_Bin_Unoinfo,
gid_Brand_File_Bin_Unopkgcom,
gid_Brand_File_Bin_Unopkgexe,
@@ -525,15 +524,6 @@ End
#endif
-#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
-File gid_Brand_File_Bin_Spadmin
- BIN_FILE_BODY;
- Dir = FILELIST_DIR;
- Name = "padmin.filelist";
- Styles = (PACKED, FILELIST);
-End
-#endif
-
#ifndef MACOSX
File gid_Brand_File_Bin_Soffice_Bin
BIN_FILE_BODY;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a88907c..ac0e199 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -564,9 +564,6 @@ UI_FILELIST(sfx, "UIConfig/sfx.filelist")
UI_FILELIST(sglobal, "UIConfig/modules/sglobal.filelist")
UI_FILELIST(simpress, "UIConfig/modules/simpress.filelist")
UI_FILELIST(smath, "UIConfig/modules/smath.filelist")
-#ifdef GUIBASE_UNX
-UI_FILELIST(spa, "UIConfig/spa.filelist")
-#endif
UI_FILELIST(startmodule, "UIConfig/modules/StartModule.filelist")
UI_FILELIST(svt, "UIConfig/svt.filelist")
UI_FILELIST(svx, "UIConfig/svx.filelist")
@@ -595,9 +592,6 @@ UI_FILELIST_ALL_LANG(sdraw, modules/sdraw)
UI_FILELIST_ALL_LANG(sfx, sfx)
UI_FILELIST_ALL_LANG(simpress, modules/simpress)
UI_FILELIST_ALL_LANG(smath, modules/smath)
-#ifdef GUIBASE_UNX
-UI_FILELIST_ALL_LANG(spa, spa)
-#endif
UI_FILELIST_ALL_LANG(svt, svt)
UI_FILELIST_ALL_LANG(svx, svx)
UI_FILELIST_ALL_LANG(swriter, modules/swriter)
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 68293d1..a8dd5eb 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -69,12 +69,6 @@ STD_RES_FILE( gid_File_Res_Sd, sd )
STD_RES_FILE( gid_File_Res_Sfx, sfx )
-#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
-
-STD_RES_FILE( gid_File_Res_Spa, spa )
-
-#endif
-
STD_RES_FILE( gid_File_Res_Sb, sb )
STD_RES_FILE( gid_File_Res_Svl, svl )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 024a347..010f3cf 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -262,9 +262,6 @@ Module gid_Module_Root_Files_6
gid_File_Share_Config_Sofficecfg_uiconfig_sglobal,
gid_File_Share_Config_Sofficecfg_uiconfig_simpress,
gid_File_Share_Config_Sofficecfg_uiconfig_smath,
-#ifdef GUIBASE_UNX
- gid_File_Share_Config_Sofficecfg_uiconfig_spa,
-#endif
gid_File_Share_Config_Sofficecfg_uiconfig_startmodule,
gid_File_Share_Config_Sofficecfg_uiconfig_svt,
gid_File_Share_Config_Sofficecfg_uiconfig_svx,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 08b7f74..104712b 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -35,9 +35,6 @@ Module gid_Module_Langpack_Basis_Template
gid_File_Share_Config_Sofficecfg_uiconfig_sfx_Lang,
gid_File_Share_Config_Sofficecfg_uiconfig_simpress_Lang,
gid_File_Share_Config_Sofficecfg_uiconfig_smath_Lang,
-#ifdef GUIBASE_UNX
- gid_File_Share_Config_Sofficecfg_uiconfig_spa_Lang,
-#endif
gid_File_Share_Config_Sofficecfg_uiconfig_svt_Lang,
gid_File_Share_Config_Sofficecfg_uiconfig_svx_Lang,
gid_File_Share_Config_Sofficecfg_uiconfig_swriter_Lang,
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e605343..d7c13f1 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -463,6 +463,7 @@ vcl_generic_code= \
vcl/generic/print/psputil \
vcl/generic/print/genpspgraphics \
vcl/generic/print/genprnpsp \
+ vcl/generic/print/prtsetup \
vcl/generic/print/text_gfx \
vcl/generic/fontmanager/fontsubst \
vcl/generic/glyphs/gcach_ftyp \
@@ -490,9 +491,6 @@ vcl_headless_freetype_code=\
vcl/headless/svptext \
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_add_defs,vcl,\
- -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
-))
$(eval $(call gb_Library_add_exception_objects,vcl,\
$(vcl_generic_code) \
vcl/unx/generic/plugadapt/salplug \
@@ -515,9 +513,6 @@ $(eval $(call gb_Library_use_externals,vcl,\
endif
ifeq ($(ENABLE_HEADLESS),TRUE)
-$(eval $(call gb_Library_add_defs,vcl,\
- -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
-))
$(eval $(call gb_Library_add_exception_objects,vcl,\
$(vcl_generic_code) \
vcl/unx/generic/printer/jobdata \
@@ -544,9 +539,6 @@ $(eval $(call gb_Library_add_libs,vcl,\
-landroid \
-llo-bootstrap \
))
-$(eval $(call gb_Library_add_defs,vcl,\
- -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
-))
$(eval $(call gb_Library_add_exception_objects,vcl,\
$(vcl_generic_code) \
vcl/unx/generic/printer/jobdata \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 51dd6922..2390020 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -101,7 +101,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
# into their own library I think.
$(eval $(call gb_Library_add_defs,vclplug_gen,\
- -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
-DVCLPLUG_GEN_IMPLEMENTATION \
))
diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk
index f2937b5..a81b30e 100644
--- a/vcl/UIConfig_vcl.mk
+++ b/vcl/UIConfig_vcl.mk
@@ -14,6 +14,9 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\
vcl/uiconfig/ui/errornocontentdialog \
vcl/uiconfig/ui/errornoprinterdialog \
vcl/uiconfig/ui/printdialog \
+ vcl/uiconfig/ui/printerdevicepage \
+ vcl/uiconfig/ui/printerpaperpage \
+ vcl/uiconfig/ui/printerpropertiesdialog \
vcl/uiconfig/ui/printprogressdialog \
vcl/uiconfig/ui/querydialog \
))
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index a60e5b6..d6e8911 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -39,8 +39,6 @@
#include "rtl/ustring.hxx"
-#include "osl/module.h"
-
#include "vcl/button.hxx"
#include "vcl/dialog.hxx"
#include "vcl/edit.hxx"
@@ -58,6 +56,7 @@
#include "jobset.h"
#include "print.h"
+#include "prtsetup.hxx"
#include "salptype.hxx"
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -69,16 +68,6 @@ using namespace com::sun::star;
/*
* static helpers
*/
-
-#if defined( UNX ) && !( defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) )
-static oslModule driverLib = NULL;
-#endif
-extern "C"
-{
-typedef int(*setupFunction)(PrinterInfo&);
-static setupFunction pSetupFunction = NULL;
-}
-
static OUString getPdfDir( const PrinterInfo& rInfo )
{
OUString aDir;
@@ -153,24 +142,6 @@ namespace
}
}
-static void getPaLib()
-{
-#if defined( UNX ) && !( defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) )
- if( ! driverLib )
- {
- driverLib = osl_loadModuleRelativeAscii( (oslGenericFunction)getPaLib,
- _XSALSET_LIBNAME,
- SAL_LOADMODULE_DEFAULT );
- if ( !driverLib )
- return;
-
- pSetupFunction = (setupFunction)osl_getAsciiFunctionSymbol( driverLib, "Sal_SetupPrinterDriver" );
- if ( !pSetupFunction )
- fprintf( stderr, "could not resolve Sal_SetupPrinterDriver\n" );
- }
-#endif
-}
-
inline int PtTo10Mu( int nPoints ) { return (int)((((double)nPoints)*35.27777778)+0.5); }
inline int TenMuToPt( int nUnits ) { return (int)((((double)nUnits)/35.27777778)+0.5); }
@@ -572,11 +543,6 @@ bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
if( ! pFrame || ! pJobSetup )
return false;
- getPaLib();
-
- if( ! pSetupFunction )
- return false;
-
PrinterInfoManager& rManager = PrinterInfoManager::get();
PrinterInfo aInfo( rManager.getPrinterInfo( pJobSetup->maPrinterName ) );
@@ -586,7 +552,7 @@ bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aInfo );
}
- if( pSetupFunction( aInfo ) )
+ if (SetupPrinterDriver(aInfo))
{
aInfo.resolveDefaultBackend();
rtl_freeMemory( pJobSetup->mpDriverData );
diff --git a/padmin/source/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
similarity index 95%
rename from padmin/source/prtsetup.cxx
rename to vcl/generic/print/prtsetup.cxx
index 938e00b..ce1f655 100644
--- a/padmin/source/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -18,16 +18,14 @@
*/
#include "prtsetup.hxx"
-#include "helper.hxx"
-#include "rtsetup.hrc"
+#include "svdata.hxx"
+#include "svids.hrc"
#include "osl/thread.h"
#include <officecfg/Office/Common.hxx>
using namespace psp;
-using namespace padmin;
-
void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, const PPDKey* pKey )
{
@@ -74,12 +72,12 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
*/
RTSDialog::RTSDialog(const PrinterInfo& rJobData, const OUString& rPrinter, Window* pParent)
- : TabDialog(pParent, "PrinterPropertiesDialog", "spa/ui/printerpropertiesdialog.ui")
+ : TabDialog(pParent, "PrinterPropertiesDialog", "vcl/ui/printerpropertiesdialog.ui")
, m_aJobData(rJobData)
, m_aPrinter(rPrinter)
, m_pPaperPage(NULL)
, m_pDevicePage(NULL)
- , m_aInvalidString(PaResId(RID_RTS_RTSDIALOG_INVALID_TXT).toString())
+ , m_aInvalidString(VclResId(SV_PRINT_INVALID_TXT))
{
get(m_pOKButton, "ok");
get(m_pCancelButton, "cancel");
@@ -163,7 +161,7 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
*/
RTSPaperPage::RTSPaperPage(RTSDialog* pParent)
- : TabPage(pParent->m_pTabControl, "PrinterPaperPage", "spa/ui/printerpaperpage.ui")
+ : TabPage(pParent->m_pTabControl, "PrinterPaperPage", "vcl/ui/printerpaperpage.ui")
, m_pParent( pParent )
{
get(m_pPaperText, "paperft");
@@ -288,7 +286,7 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
*/
RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
- : TabPage(pParent->m_pTabControl, "PrinterDevicePage", "spa/ui/printerdevicepage.ui" )
+ : TabPage(pParent->m_pTabControl, "PrinterDevicePage", "vcl/ui/printerdevicepage.ui" )
, m_pParent( pParent )
{
get(m_pPPDKeyBox, "options");
@@ -472,21 +470,18 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
m_pPPDValueBox->SelectEntryPos( m_pPPDValueBox->GetEntryPos( (void*)pValue ) );
}
-extern "C" {
+int SetupPrinterDriver(::psp::PrinterInfo& rJobData)
+{
+ int nRet = 0;
+ RTSDialog aDialog( rJobData, rJobData.m_aPrinterName, false );
- int SPA_DLLPUBLIC Sal_SetupPrinterDriver( ::psp::PrinterInfo& rJobData )
+ if( aDialog.Execute() )
{
- int nRet = 0;
- RTSDialog aDialog( rJobData, rJobData.m_aPrinterName, false );
-
- if( aDialog.Execute() )
- {
- rJobData = aDialog.getSetup();
- nRet = 1;
- }
-
- return nRet;
+ rJobData = aDialog.getSetup();
+ nRet = 1;
}
-} // extern "C"
+
+ return nRet;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/source/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
similarity index 98%
rename from padmin/source/prtsetup.hxx
rename to vcl/generic/print/prtsetup.hxx
index f5638c7..dd1d109 100644
--- a/padmin/source/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -20,8 +20,6 @@
#ifndef _PAD_PRTSETUP_HXX_
#define _PAD_PRTSETUP_HXX_
-#include "helper.hxx"
-
#include "tools/link.hxx"
#include "vcl/tabdlg.hxx"
@@ -35,8 +33,6 @@
#include "vcl/ppdparser.hxx"
#include "vcl/printerinfomanager.hxx"
-namespace padmin {
-
class RTSPaperPage;
class RTSDevicePage;
@@ -126,7 +122,7 @@ public:
sal_uLong getColorDevice();
};
-} // namespace
+int SetupPrinterDriver(::psp::PrinterInfo& rJobData);
#endif // _PAD_PRTSETUP_HXX
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index cfbd774..3b0d7d6 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -86,7 +86,7 @@ public:
/// check if the printer configuration has changed
virtual bool checkPrintersChanged( bool bWait );
- // members for administration (->padmin)
+ // members for administration
// disable for CUPS
virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName );
virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false );
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 6cb7d73..2bd0e22 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -213,6 +213,7 @@
#define SV_PRINT_COLLATE_IMG 10613
#define SV_PRINT_NOCOLLATE_IMG 10614
#define SV_PRINT_QUERYFAXNUMBER_TXT 10615
+#define SV_PRINT_INVALID_TXT 10616
#define SV_EDIT_WARNING_BOX 10650
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index 738adb3..bd9f85b 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -110,4 +110,9 @@ String SV_PRINT_QUERYFAXNUMBER_TXT
Text [ en-US ] = "Please enter the fax number.";
};
+String SV_PRINT_INVALID_TXT
+{
+ Text [ en-US ] = "<ignore>";
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/uiconfig/ui/printerdevicepage.ui b/vcl/uiconfig/ui/printerdevicepage.ui
similarity index 100%
rename from padmin/uiconfig/ui/printerdevicepage.ui
rename to vcl/uiconfig/ui/printerdevicepage.ui
diff --git a/padmin/uiconfig/ui/printerpaperpage.ui b/vcl/uiconfig/ui/printerpaperpage.ui
similarity index 100%
rename from padmin/uiconfig/ui/printerpaperpage.ui
rename to vcl/uiconfig/ui/printerpaperpage.ui
diff --git a/padmin/uiconfig/ui/printerpropertiesdialog.ui b/vcl/uiconfig/ui/printerpropertiesdialog.ui
similarity index 100%
rename from padmin/uiconfig/ui/printerpropertiesdialog.ui
rename to vcl/uiconfig/ui/printerpropertiesdialog.ui
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 35116c1..bf92b77 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -529,7 +529,7 @@ void PrinterInfoManager::initialize()
aPrinterName += ">";
if( m_aPrinters.find( aPrinterName ) != m_aPrinters.end() )
- // probably user made this one permanent in padmin
+ // probably user made this one permanent
continue;
OUString aCmd( m_aSystemPrintCommand );
@@ -544,7 +544,7 @@ void PrinterInfoManager::initialize()
aPrinter.m_aInfo.m_aComment = it->m_aComment;
aPrinter.m_aInfo.m_aLocation = it->m_aLocation;
aPrinter.m_bModified = false;
- aPrinter.m_aGroup = OUStringToOString(aPrinterName, aEncoding); //provide group name in case user makes this one permanent in padmin
+ aPrinter.m_aGroup = OUStringToOString(aPrinterName, aEncoding); //provide group name in case user makes this one permanent
m_aPrinters[ aPrinterName ] = aPrinter;
}
@@ -787,8 +787,8 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin
#endif
// comment: logically one should writePrinterConfig() here
// but immediately after addPrinter() a changePrinterInfo()
- // will follow (see padmin code), which writes it again,
- // so we can currently save some performance here
+ // will follow which writes it again, so we can currently save some
+ // performance here
}
return bSuccess;
}
commit f6cd982a68528ac1bfd130080cea3f96e6cc7edd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 21 09:46:40 2014 +0000
move the cups password dialog from padmin to vcl
now we don't have to dlopen padmin to get it so we can drop that complicated
stuff.
Change-Id: I2f01bd104aae8f17ada9a445da653b441a927c70
diff --git a/padmin/UIConfig_spa.mk b/padmin/UIConfig_spa.mk
index 242b305..565f0cc 100644
--- a/padmin/UIConfig_spa.mk
+++ b/padmin/UIConfig_spa.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_UIConfig_UIConfig,spa))
$(eval $(call gb_UIConfig_add_uifiles,spa,\
- padmin/uiconfig/ui/cupspassworddialog \
padmin/uiconfig/ui/printerdevicepage \
padmin/uiconfig/ui/printerpaperpage \
padmin/uiconfig/ui/printerpropertiesdialog \
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 38494d5..938e00b 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -472,43 +472,6 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
m_pPPDValueBox->SelectEntryPos( m_pPPDValueBox->GetEntryPos( (void*)pValue ) );
}
-class RTSPWDialog : public ModalDialog
-{
- FixedText* m_pText;
- Edit* m_pUserEdit;
- Edit* m_pPassEdit;
-
-public:
- RTSPWDialog(const OString& rServer, const OString& rUserName, Window* pParent);
-
- OString getUserName() const;
- OString getPassword() const;
-};
-
-RTSPWDialog::RTSPWDialog( const OString& rServer, const OString& rUserName, Window* pParent )
- : ModalDialog(pParent, "CUPSPasswordDialog",
- "spa/ui/cupspassworddialog.ui")
-{
- get(m_pText, "text");
- get(m_pUserEdit, "user");
- get(m_pPassEdit, "pass");
-
- OUString aText(m_pText->GetText());
- aText = aText.replaceFirst("%s", OStringToOUString(rServer, osl_getThreadTextEncoding()));
- m_pText->SetText(aText);
- m_pUserEdit->SetText( OStringToOUString(rUserName, osl_getThreadTextEncoding()));
-}
-
-OString RTSPWDialog::getUserName() const
-{
- return OUStringToOString( m_pUserEdit->GetText(), osl_getThreadTextEncoding() );
-}
-
-OString RTSPWDialog::getPassword() const
-{
- return OUStringToOString( m_pPassEdit->GetText(), osl_getThreadTextEncoding() );
-}
-
extern "C" {
int SPA_DLLPUBLIC Sal_SetupPrinterDriver( ::psp::PrinterInfo& rJobData )
@@ -524,21 +487,6 @@ extern "C" {
return nRet;
}
-
- bool SPA_DLLPUBLIC Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword )
- {
- bool bRet = false;
-
- RTSPWDialog aDialog( rServer, rUserName, NULL );
- if( aDialog.Execute() )
- {
- rUserName = aDialog.getUserName();
- rPassword = aDialog.getPassword();
- bRet = true;
- }
- return bRet;
- }
-
} // extern "C"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk
index bdc028e..f2937b5 100644
--- a/vcl/UIConfig_vcl.mk
+++ b/vcl/UIConfig_vcl.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,vcl))
$(eval $(call gb_UIConfig_add_uifiles,vcl,\
+ vcl/uiconfig/ui/cupspassworddialog \
vcl/uiconfig/ui/errornocontentdialog \
vcl/uiconfig/ui/errornoprinterdialog \
vcl/uiconfig/ui/printdialog \
diff --git a/padmin/uiconfig/ui/cupspassworddialog.ui b/vcl/uiconfig/ui/cupspassworddialog.ui
similarity index 100%
rename from padmin/uiconfig/ui/cupspassworddialog.ui
rename to vcl/uiconfig/ui/cupspassworddialog.ui
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 9c7af07..b9e5af0 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -35,6 +35,10 @@
#include <officecfg/Office/Common.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/fixed.hxx>
+
#include <algorithm>
using namespace psp;
@@ -827,36 +831,76 @@ bool CUPSManager::writePrinterConfig()
return PrinterInfoManager::writePrinterConfig();
}
-const char* CUPSManager::authenticateUser( const char* /*pIn*/ )
+namespace
{
- const char* pRet = NULL;
- oslModule pLib = osl_loadModuleAscii( _XSALSET_LIBNAME, SAL_LOADMODULE_LAZY );
- if( pLib )
+ class RTSPWDialog : public ModalDialog
{
- OUString aSym( "Sal_authenticateQuery" );
- bool (*getpw)( const OString& rServer, OString& rUser, OString& rPw) =
- (bool(*)(const OString&,OString&,OString&))osl_getFunctionSymbol( pLib, aSym.pData );
- if( getpw )
- {
- osl::MutexGuard aGuard( m_aCUPSMutex );
+ FixedText* m_pText;
+ Edit* m_pUserEdit;
+ Edit* m_pPassEdit;
- OString aUser = cupsUser();
- OString aServer = cupsServer();
- OString aPassword;
- if( getpw( aServer, aUser, aPassword ) )
- {
- m_aPassword = aPassword;
- m_aUser = aUser;
- cupsSetUser( m_aUser.getStr() );
- pRet = m_aPassword.getStr();
- }
+ public:
+ RTSPWDialog(const OString& rServer, const OString& rUserName, Window* pParent);
+
+ OString getUserName() const;
+ OString getPassword() const;
+ };
+
+ RTSPWDialog::RTSPWDialog( const OString& rServer, const OString& rUserName, Window* pParent )
+ : ModalDialog(pParent, "CUPSPasswordDialog",
+ "vcl/ui/cupspassworddialog.ui")
+ {
+ get(m_pText, "text");
+ get(m_pUserEdit, "user");
+ get(m_pPassEdit, "pass");
+
+ OUString aText(m_pText->GetText());
+ aText = aText.replaceFirst("%s", OStringToOUString(rServer, osl_getThreadTextEncoding()));
+ m_pText->SetText(aText);
+ m_pUserEdit->SetText( OStringToOUString(rUserName, osl_getThreadTextEncoding()));
+ }
+
+ OString RTSPWDialog::getUserName() const
+ {
+ return OUStringToOString( m_pUserEdit->GetText(), osl_getThreadTextEncoding() );
+ }
+
+ OString RTSPWDialog::getPassword() const
+ {
+ return OUStringToOString( m_pPassEdit->GetText(), osl_getThreadTextEncoding() );
+ }
+
+ bool AuthenticateQuery(const OString& rServer, OString& rUserName, OString& rPassword)
+ {
+ bool bRet = false;
+
+ RTSPWDialog aDialog(rServer, rUserName, NULL);
+ if (aDialog.Execute())
+ {
+ rUserName = aDialog.getUserName();
+ rPassword = aDialog.getPassword();
+ bRet = true;
}
- osl_unloadModule( pLib );
+
+ return bRet;
}
- else
+}
+
+const char* CUPSManager::authenticateUser( const char* /*pIn*/ )
+{
+ const char* pRet = NULL;
+
+ osl::MutexGuard aGuard( m_aCUPSMutex );
+
+ OString aUser = cupsUser();
+ OString aServer = cupsServer();
+ OString aPassword;
+ if (AuthenticateQuery(aServer, aUser, aPassword))
{
- SAL_WARN("vcl.unx.print",
- "loading of module " << _XSALSET_LIBNAME << " failed\n");
+ m_aPassword = aPassword;
+ m_aUser = aUser;
+ cupsSetUser( m_aUser.getStr() );
+ pRet = m_aPassword.getStr();
}
return pRet;
commit 42aeaee8dfc8cdd11428079e9fe357534bbb8898
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 21 09:40:48 2014 +0000
convert CUPS password dialog to .ui
Change-Id: Ibdf4da93848e2c8b46f89cbfba4c282291f0c744
diff --git a/padmin/UIConfig_spa.mk b/padmin/UIConfig_spa.mk
index 565f0cc..242b305 100644
--- a/padmin/UIConfig_spa.mk
+++ b/padmin/UIConfig_spa.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,spa))
$(eval $(call gb_UIConfig_add_uifiles,spa,\
+ padmin/uiconfig/ui/cupspassworddialog \
padmin/uiconfig/ui/printerdevicepage \
padmin/uiconfig/ui/printerpaperpage \
padmin/uiconfig/ui/printerpropertiesdialog \
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index b526ec7..38494d5 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -474,52 +474,39 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
class RTSPWDialog : public ModalDialog
{
- FixedText m_aText;
- FixedText m_aUserText;
- Edit m_aUserEdit;
- FixedText m_aPassText;
- Edit m_aPassEdit;
-
- OKButton m_aOKButton;
- CancelButton m_aCancelButton;
+ FixedText* m_pText;
+ Edit* m_pUserEdit;
+ Edit* m_pPassEdit;
+
public:
- RTSPWDialog( const OString& rServer, const OString& rUserName, Window* pParent );
- ~RTSPWDialog();
+ RTSPWDialog(const OString& rServer, const OString& rUserName, Window* pParent);
OString getUserName() const;
OString getPassword() const;
};
RTSPWDialog::RTSPWDialog( const OString& rServer, const OString& rUserName, Window* pParent )
- :
- ModalDialog( pParent, PaResId( RID_RTS_PWDIALOG ) ),
- m_aText( this, PaResId( RID_RTS_PWDIALOG_TXT ) ),
- m_aUserText( this, PaResId( RID_RTS_PWDIALOG_USER_TXT ) ),
- m_aUserEdit( this, PaResId( RID_RTS_PWDIALOG_USER_EDT ) ),
- m_aPassText( this, PaResId( RID_RTS_PWDIALOG_PASS_TXT ) ),
- m_aPassEdit( this, PaResId( RID_RTS_PWDIALOG_PASS_EDT ) ),
- m_aOKButton( this, PaResId( RID_RTS_PWDIALOG_OK_BTN ) ),
- m_aCancelButton( this, PaResId( RID_RTS_PWDIALOG_CANCEL_BTN ) )
-{
- FreeResource();
- OUString aText( m_aText.GetText() );
- aText = aText.replaceFirst( "%s", OStringToOUString( rServer, osl_getThreadTextEncoding() ) );
- m_aText.SetText( aText );
- m_aUserEdit.SetText( OStringToOUString( rUserName, osl_getThreadTextEncoding() ) );
-}
-
-RTSPWDialog::~RTSPWDialog()
+ : ModalDialog(pParent, "CUPSPasswordDialog",
+ "spa/ui/cupspassworddialog.ui")
{
+ get(m_pText, "text");
+ get(m_pUserEdit, "user");
+ get(m_pPassEdit, "pass");
+
+ OUString aText(m_pText->GetText());
+ aText = aText.replaceFirst("%s", OStringToOUString(rServer, osl_getThreadTextEncoding()));
+ m_pText->SetText(aText);
+ m_pUserEdit->SetText( OStringToOUString(rUserName, osl_getThreadTextEncoding()));
}
OString RTSPWDialog::getUserName() const
{
- return OUStringToOString( m_aUserEdit.GetText(), osl_getThreadTextEncoding() );
+ return OUStringToOString( m_pUserEdit->GetText(), osl_getThreadTextEncoding() );
}
OString RTSPWDialog::getPassword() const
{
- return OUStringToOString( m_aPassEdit.GetText(), osl_getThreadTextEncoding() );
+ return OUStringToOString( m_pPassEdit->GetText(), osl_getThreadTextEncoding() );
}
extern "C" {
diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc
index 5a58ea69..f5f0f69 100644
--- a/padmin/source/rtsetup.hrc
+++ b/padmin/source/rtsetup.hrc
@@ -22,15 +22,6 @@
#define RID_RTS_RTSDIALOG_INVALID_TXT 4001
-#define RID_RTS_PWDIALOG 4008
-#define RID_RTS_PWDIALOG_TXT 1
-#define RID_RTS_PWDIALOG_USER_TXT 2
-#define RID_RTS_PWDIALOG_USER_EDT 3
-#define RID_RTS_PWDIALOG_PASS_TXT 4
-#define RID_RTS_PWDIALOG_PASS_EDT 5
-#define RID_RTS_PWDIALOG_OK_BTN 6
-#define RID_RTS_PWDIALOG_CANCEL_BTN 7
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
index 89d332d..383aead 100644
--- a/padmin/source/rtsetup.src
+++ b/padmin/source/rtsetup.src
@@ -24,61 +24,4 @@ String RID_RTS_RTSDIALOG_INVALID_TXT
Text [ en-US ] = "<ignore>";
};
-ModalDialog RID_RTS_PWDIALOG
-{
- HelpID = "padmin:ModalDialog:RID_RTS_PWDIALOG";
- Text [ en-US ] = "Authentication request";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 150 , 90 ) ;
- Moveable = TRUE ;
- Closeable = TRUE ;
-
- FixedText RID_RTS_PWDIALOG_TXT
- {
- Pos = MAP_APPFONT( 5, 5 );
- Size = MAP_APPFONT( 140, 20 );
- WordBreak = TRUE;
- Text [ en-US ] = "Please enter your authentication data for server %s";
- };
- FixedText RID_RTS_PWDIALOG_USER_TXT
- {
- Pos = MAP_APPFONT( 5, 30 );
- Size = MAP_APPFONT( 60, 10 );
- Text [ en-US ] = "~User";
- };
- Edit RID_RTS_PWDIALOG_USER_EDT
- {
- HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_USER_EDT";
- Pos = MAP_APPFONT( 70, 29 );
- Size = MAP_APPFONT( 75, 12 );
- Border = TRUE;
- };
- FixedText RID_RTS_PWDIALOG_PASS_TXT
- {
- Pos = MAP_APPFONT( 5, 45 );
- Size = MAP_APPFONT( 60, 10 );
- Text [ en-US ] = "~Password";
- };
- Edit RID_RTS_PWDIALOG_PASS_EDT
- {
- HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_PASS_EDT";
- Pos = MAP_APPFONT( 70, 44 );
- Size = MAP_APPFONT( 75, 12 );
- Border = TRUE;
- Password = TRUE;
- };
- CancelButton RID_RTS_PWDIALOG_CANCEL_BTN
- {
- Pos = MAP_APPFONT( 95, 70 );
- Size = MAP_APPFONT( 50, 15 );
- };
- OKButton RID_RTS_PWDIALOG_OK_BTN
- {
- Pos = MAP_APPFONT( 5, 70 );
- Size = MAP_APPFONT( 50, 15 );
- DefButton = TRUE;
- };
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/uiconfig/ui/cupspassworddialog.ui b/padmin/uiconfig/ui/cupspassworddialog.ui
new file mode 100644
index 0000000..81f80e8
--- /dev/null
+++ b/padmin/uiconfig/ui/cupspassworddialog.ui
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkDialog" id="CUPSPasswordDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Authentication request</property>
+ <property name="type_hint">normal</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_User</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">user</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Password</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pass</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="text">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Please enter your authentication data for server %s</property>
+ <property name="use_underline">True</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">56</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="user">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="pass">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="visibility">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit b3a162ccecd24c61d4d6daeb7ac9bcd1a75db7be
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 21 09:07:42 2014 +0000
move the fax dialog from padmin to vcl
now we don't have to dlopen padmin to get it
so we can drop that complicated stuff and don't need
to be unx only
Change-Id: I0e585b05a4ecf2a1c8a3ac5275185d81ada518e5
diff --git a/padmin/UIConfig_spa.mk b/padmin/UIConfig_spa.mk
index 6ac5ba2..565f0cc 100644
--- a/padmin/UIConfig_spa.mk
+++ b/padmin/UIConfig_spa.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_UIConfig_add_uifiles,spa,\
padmin/uiconfig/ui/printerdevicepage \
padmin/uiconfig/ui/printerpaperpage \
padmin/uiconfig/ui/printerpropertiesdialog \
- padmin/uiconfig/ui/querydialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index d0e2a51..da9fcab 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -75,38 +75,4 @@ ResId padmin::PaResId( sal_uInt32 nId )
return ResId( nId, *pPaResMgr );
}
-/*
- * QueryString
- */
-QueryString::QueryString(Window* pParent, OUString& rQuery, OUString& rRet)
- : ModalDialog(pParent, "QueryDialog",
- "spa/ui/querydialog.ui" )
- , m_rReturnValue( rRet )
-{
- get(m_pOKButton, "ok");
- get(m_pFixedText, "label");
- get(m_pEdit, "entry");
-
- m_pOKButton->SetClickHdl( LINK( this, QueryString, ClickBtnHdl ) );
- m_pFixedText->SetText( rQuery );
- m_pEdit->SetText( m_rReturnValue );
- SetText( Application::GetDisplayName() );
-}
-
-QueryString::~QueryString()
-{
-}
-
-IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton )
-{
- if (pButton == m_pOKButton)
- {
- m_rReturnValue = m_pEdit->GetText();
- EndDialog( 1 );
- }
- else
- EndDialog(0);
- return 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
index 1e491d2..b7b8fb8 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.hxx
@@ -38,24 +38,7 @@
namespace padmin
{
-class QueryString : public ModalDialog
-{
-private:
- OKButton* m_pOKButton;
- FixedText* m_pFixedText;
- Edit* m_pEdit;
- OUString& m_rReturnValue;
-
- DECL_LINK( ClickBtnHdl, Button* );
-
-public:
- QueryString(Window*, OUString &, OUString &);
- // parent window, Query text, initial value
- ~QueryString();
-};
-
ResId PaResId( sal_uInt32 nId );
-
} // namespace padmin
#endif
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index bda0d01..b526ec7 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -538,13 +538,6 @@ extern "C" {
return nRet;
}
- int SPA_DLLPUBLIC Sal_queryFaxNumber( OUString& rNumber )
- {
- OUString aTmpString( PaResId( RID_TXT_QUERYFAXNUMBER ) );
- QueryString aQuery( NULL, aTmpString, rNumber );
- return aQuery.Execute();
- }
-
bool SPA_DLLPUBLIC Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword )
{
bool bRet = false;
diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc
index aab206a..5a58ea69 100644
--- a/padmin/source/rtsetup.hrc
+++ b/padmin/source/rtsetup.hrc
@@ -22,8 +22,6 @@
#define RID_RTS_RTSDIALOG_INVALID_TXT 4001
-#define RID_TXT_QUERYFAXNUMBER 4007
-
#define RID_RTS_PWDIALOG 4008
#define RID_RTS_PWDIALOG_TXT 1
#define RID_RTS_PWDIALOG_USER_TXT 2
diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
index 74953c9..89d332d 100644
--- a/padmin/source/rtsetup.src
+++ b/padmin/source/rtsetup.src
@@ -24,11 +24,6 @@ String RID_RTS_RTSDIALOG_INVALID_TXT
Text [ en-US ] = "<ignore>";
};
-String RID_TXT_QUERYFAXNUMBER
-{
- Text [ en-US ] = "Please enter the fax number.";
-};
-
ModalDialog RID_RTS_PWDIALOG
{
HelpID = "padmin:ModalDialog:RID_RTS_PWDIALOG";
diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk
index d37c985..bdc028e 100644
--- a/vcl/UIConfig_vcl.mk
+++ b/vcl/UIConfig_vcl.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\
vcl/uiconfig/ui/errornoprinterdialog \
vcl/uiconfig/ui/printdialog \
vcl/uiconfig/ui/printprogressdialog \
+ vcl/uiconfig/ui/querydialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index cc379e5..a60e5b6 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -41,12 +41,16 @@
#include "osl/module.h"
+#include "vcl/button.hxx"
+#include "vcl/dialog.hxx"
+#include "vcl/edit.hxx"
+#include "vcl/fixed.hxx"
#include "vcl/svapp.hxx"
#include "vcl/print.hxx"
#include "vcl/pdfwriter.hxx"
#include "vcl/printerinfomanager.hxx"
#include "vcl/settings.hxx"
-
+#include "svids.hrc"
#include "saldatabasic.hxx"
#include "generic/genprn.h"
#include "generic/geninst.h"
@@ -73,8 +77,6 @@ extern "C"
{
typedef int(*setupFunction)(PrinterInfo&);
static setupFunction pSetupFunction = NULL;
-typedef int(*faxFunction)(OUString&);
-static faxFunction pFaxNrFunction = NULL;
}
static OUString getPdfDir( const PrinterInfo& rInfo )
@@ -96,6 +98,61 @@ static OUString getPdfDir( const PrinterInfo& rInfo )
return aDir;
}
+namespace
+{
+ class QueryString : public ModalDialog
+ {
+ private:
+ OKButton* m_pOKButton;
+ FixedText* m_pFixedText;
+ Edit* m_pEdit;
+ OUString& m_rReturnValue;
+
+ DECL_LINK( ClickBtnHdl, Button* );
+
+ public:
+ // parent window, Query text, initial value
+ QueryString(Window*, OUString &, OUString &);
+ };
+
+ /*
+ * QueryString
+ */
+ QueryString::QueryString(Window* pParent, OUString& rQuery, OUString& rRet)
+ : ModalDialog(pParent, "QueryDialog",
+ "vcl/ui/querydialog.ui" )
+ , m_rReturnValue( rRet )
+ {
+ get(m_pOKButton, "ok");
+ get(m_pFixedText, "label");
+ get(m_pEdit, "entry");
+
+ m_pOKButton->SetClickHdl(LINK(this, QueryString, ClickBtnHdl));
+ m_pFixedText->SetText(rQuery);
+ m_pEdit->SetText(m_rReturnValue);
+ SetText(Application::GetDisplayName());
+ }
+
+ IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton )
+ {
+ if (pButton == m_pOKButton)
+ {
+ m_rReturnValue = m_pEdit->GetText();
+ EndDialog( 1 );
+ }
+ else
+ EndDialog(0);
+ return 0;
+ }
+
+ int QueryFaxNumber(OUString& rNumber)
+ {
+ OUString aTmpString(VclResId(SV_PRINT_QUERYFAXNUMBER_TXT));
+ QueryString aQuery(NULL, aTmpString, rNumber);
+ return aQuery.Execute();
+ }
+}
+
static void getPaLib()
{
#if defined( UNX ) && !( defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) )
@@ -110,10 +167,6 @@ static void getPaLib()
pSetupFunction = (setupFunction)osl_getAsciiFunctionSymbol( driverLib, "Sal_SetupPrinterDriver" );
if ( !pSetupFunction )
fprintf( stderr, "could not resolve Sal_SetupPrinterDriver\n" );
-
- pFaxNrFunction = (faxFunction)osl_getAsciiFunctionSymbol( driverLib, "Sal_queryFaxNumber" );
- if ( !pFaxNrFunction )
- fprintf( stderr, "could not resolve Sal_queryFaxNumber\n" );
}
#endif
}
@@ -308,23 +361,17 @@ static std::vector<OUString> getFaxNumbers()
{
std::vector<OUString> aFaxNumbers;
-#if defined( UNX )
- getPaLib();
- if (pFaxNrFunction)
+ OUString aNewNr;
+ if (QueryFaxNumber(aNewNr))
{
- OUString aNewNr;
- if( pFaxNrFunction( aNewNr ) )
+ sal_Int32 nIndex = 0;
+ do
{
- sal_Int32 nIndex = 0;
- do
- {
- OUString sToken = aNewNr.getToken( 0, ';', nIndex );
- aFaxNumbers.push_back(sToken);
- }
- while (nIndex >= 0);
+ OUString sToken = aNewNr.getToken( 0, ';', nIndex );
+ aFaxNumbers.push_back(sToken);
}
+ while (nIndex >= 0);
}
-#endif
return aFaxNumbers;
}
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index f3c3f4d..6cb7d73 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -212,6 +212,7 @@
#define SV_PRINT_PRINTPREVIEW_TXT 10612
#define SV_PRINT_COLLATE_IMG 10613
#define SV_PRINT_NOCOLLATE_IMG 10614
+#define SV_PRINT_QUERYFAXNUMBER_TXT 10615
#define SV_EDIT_WARNING_BOX 10650
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index 4bfa750..738adb3 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -105,4 +105,9 @@ Image SV_PRINT_NOCOLLATE_IMG
ImageBitmap = Bitmap { File = "ncollate.png" ; };
};
+String SV_PRINT_QUERYFAXNUMBER_TXT
+{
+ Text [ en-US ] = "Please enter the fax number.";
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/uiconfig/ui/querydialog.ui b/vcl/uiconfig/ui/querydialog.ui
similarity index 100%
rename from padmin/uiconfig/ui/querydialog.ui
rename to vcl/uiconfig/ui/querydialog.ui
More information about the Libreoffice-commits
mailing list