summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-08-09 09:35:54 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-08-09 18:12:08 +0200
commitb62b3042e6cd687b6dc680afaa7cc677f2bfe238 (patch)
tree7592cb62cd492d4e8e7afe941e795901985ce2e1
parent2903650409566c69e89b7397dcb4bd556f3038cd (diff)
remove DLG_PARAMETERS resource stuff
clean up after b15c01e43071099c6cb631953e56e88e9961e29e Change-Id: Id50032647d74892f33e1f5214226e9fd0b7d7b62
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx7
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.hrc35
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.src69
-rw-r--r--dbaccess/source/ui/inc/dbu_dlg.hrc4
-rw-r--r--dbaccess/source/ui/inc/dbu_resource.hrc2
5 files changed, 6 insertions, 111 deletions
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index c59e41597b16..6a6fa5c104a2 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -18,7 +18,6 @@
*/
#include "paramdialog.hxx"
-#include "paramdialog.hrc"
#include "dbu_dlg.hrc"
#include "commontypes.hxx"
#include "moduledbu.hxx"
@@ -195,11 +194,7 @@ namespace dbaui
DBG_UNHANDLED_EXCEPTION();
}
- OUString sMessage;
- {
- LocalResourceAccess aDummy(DLG_PARAMETERS, RSC_MODALDIALOG);
- sMessage = ModuleRes(STR_COULD_NOT_CONVERT_PARAM);
- }
+ OUString sMessage(ModuleRes(STR_COULD_NOT_CONVERT_PARAM));
sMessage = sMessage.replaceAll( "$name$", sName );
ErrorBox(NULL, WB_OK, sMessage).Execute();
m_pParam->GrabFocus();
diff --git a/dbaccess/source/ui/dlg/paramdialog.hrc b/dbaccess/source/ui/dlg/paramdialog.hrc
deleted file mode 100644
index e625f51154e0..000000000000
--- a/dbaccess/source/ui/dlg/paramdialog.hrc
+++ /dev/null
@@ -1,35 +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 _DBAUI_PARAMDIALOG_HRC_
-#define _DBAUI_PARAMDIALOG_HRC_
-
-#define LB_ALLPARAMS 1
-#define FL_PARAMS 2
-#define FT_VALUE 3
-#define ET_PARAM 4
-#define BT_TRAVELNEXT 6
-#define BT_OK 7
-#define BT_CANCEL 8
-
-#define STR_COULD_NOT_CONVERT_PARAM 1
-
-#endif // _DBAUI_PARAMDIALOG_HRC_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index 2b745f34d5cc..fc8d020bcfee 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -17,76 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "paramdialog.hrc"
#include "dbu_dlg.hrc"
-#define LIST_WIDTH 100
-#define LIST_HEIGHT 50
-
-ModalDialog DLG_PARAMETERS
+String STR_COULD_NOT_CONVERT_PARAM
{
- HelpID = "dbaccess:ModalDialog:DLG_PARAMETERS";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 6 + LIST_WIDTH + 3 + 6 + BUTTON_WIDTH + 6, 98 ) ;
- Moveable = TRUE ;
- Closeable = TRUE ;
-
- FixedLine FL_PARAMS
- {
- Pos = MAP_APPFONT ( 4 , 3 ) ;
- Size = MAP_APPFONT ( 3 + LIST_WIDTH + 3 , 8 ) ;
- Text [ en-US ] = "~Parameters";
- };
- ListBox LB_ALLPARAMS
- {
- HelpID = "dbaccess:ListBox:DLG_PARAMETERS:LB_ALLPARAMS";
- Pos = MAP_APPFONT ( 7 , 12 ) ;
- Size = MAP_APPFONT ( LIST_WIDTH , LIST_HEIGHT ) ;
- Border = TRUE;
- SVLook = TRUE;
- };
- FixedText FT_VALUE
- {
- Pos = MAP_APPFONT ( 7 , 12 + LIST_HEIGHT + 4 ) ;
- Size = MAP_APPFONT ( LIST_WIDTH , 8 ) ;
- Text [ en-US ] = "~Value";
- };
- Edit ET_PARAM
- {
- HelpID = "dbaccess:Edit:DLG_PARAMETERS:ET_PARAM";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 7 , 12 + LIST_HEIGHT + 4 + 8 + 3 ) ;
- Size = MAP_APPFONT ( LIST_WIDTH , 12 ) ;
- TabStop = TRUE ;
- };
- PushButton BT_TRAVELNEXT
- {
- HelpID = "dbaccess:PushButton:DLG_PARAMETERS:BT_TRAVELNEXT";
- Pos = MAP_APPFONT ( 4 + 3 + LIST_WIDTH + 3 + 6 , 12 + LIST_HEIGHT + 4 + 8 + 3 + ( 12 - BUTTON_HEIGHT ) / 2) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Next";
- };
- OKButton BT_OK
- {
- Pos = MAP_APPFONT ( 4 + 3 + LIST_WIDTH + 3 + 6 , 3 ) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BT_CANCEL
- {
- Pos = MAP_APPFONT ( 4 + 3 + LIST_WIDTH + 3 + 6 , 3 + BUTTON_HEIGHT + 3 ) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- };
- Text [ en-US ] = "Parameter Input" ;
-
- String STR_COULD_NOT_CONVERT_PARAM
- {
- Text [ en-US ] = "The entry could not be converted to a valid value for the \"$name$\"column";
- };
+ Text [ en-US ] = "The entry could not be converted to a valid value for the \"$name$\"column";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index f3b3823a59cd..051f91179c17 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -152,9 +152,11 @@
#define STR_DATABASE_TYPE_CHANGE RID_STR_DLG_START + 101
+#define STR_COULD_NOT_CONVERT_PARAM RID_STR_DLG_START + 102
+
// please adjust checking before insert new strings
-#define LAST_STR_HERE RID_STR_DLG_START + 102
+#define LAST_STR_HERE RID_STR_DLG_START + 103
#if LAST_STR_HERE > RID_STR_DLG_END
#error Resource-Id Overflow in #file, #line
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index f61c119cb6a8..111df59aa299 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -73,8 +73,6 @@
#endif
// dialog ids
-#define DLG_PARAMETERS RID_DIALOG_START + 5
-
#define DLG_JOIN_TABADD RID_DIALOG_START + 14
// FREE
// FREE