[Libreoffice-commits] .: svtools/AllLangResTarget_svt.mk svtools/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 13 05:48:32 PST 2012


 svtools/AllLangResTarget_svt.mk                  |    1 
 svtools/source/dialogs/PlaceEditDialog.cxx       |    1 
 svtools/source/dialogs/PlaceEditDialog.hrc       |   66 ------
 svtools/source/dialogs/PlaceEditDialog.src       |  223 -----------------------
 svtools/source/dialogs/ServerDetailsControls.cxx |    2 
 5 files changed, 293 deletions(-)

New commits:
commit 000928b3b38fa7cdd3bca90419ed680eb59ad646
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Tue Nov 13 14:38:11 2012 +0100

    PlaceEditDialog: removed now useless hrc/src files
    
    Change-Id: I6966c621343a9c1c7a7f703c026f7e6d39976154

diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 81f05b4..165552d 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -62,7 +62,6 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
     svtools/source/dialogs/addresstemplate.src \
     svtools/source/dialogs/filedlg2.src \
     svtools/source/dialogs/formats.src \
-    svtools/source/dialogs/PlaceEditDialog.src \
     svtools/source/dialogs/prnsetup.src \
     svtools/source/dialogs/so3res.src \
     svtools/source/dialogs/wizardmachine.src \
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 2074bd5..ca391d4 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -26,7 +26,6 @@
  * instead of those above.
  */
 
-#include "PlaceEditDialog.hrc"
 #include "PlaceEditDialog.hxx"
 #include "ServerDetailsControls.hxx"
 
diff --git a/svtools/source/dialogs/PlaceEditDialog.hrc b/svtools/source/dialogs/PlaceEditDialog.hrc
deleted file mode 100644
index 94728ff..0000000
--- a/svtools/source/dialogs/PlaceEditDialog.hrc
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * [ Copyright (C) 2012 SUSE <cbosdonnat at suse.com> (initial developer) ]
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#ifndef _FPICKER_PLACEEDITDLG_HRC
-#define _FPICKER_PLACEEDITDLG_HRC
-
-#include <svl/solar.hrc>
-#include <vcl/fpicker.hrc>
-
-#define DLG_FPICKER_PLACE_EDIT                      (RID_FPICKER_START+16)
-
-// DLG_FPICKER_PLACE_EDIT ------------------------------
-#define FT_ADDPLACE_SERVERNAME		  		    10
-#define FT_ADDPLACE_SERVERTYPE		  		    11
-#define ED_ADDPLACE_SERVERNAME		  		    12
-#define LB_ADDPLACE_SERVERTYPE		  		    13
-#define BT_ADDPLACE_OK				      		14
-#define BT_ADDPLACE_CANCEL		    			15
-#define BT_ADDPLACE_DELETE			    		16
-#define FT_ADDPLACE_HOST        	 		    17
-#define ED_ADDPLACE_HOST        	 		    18
-#define FT_ADDPLACE_PORT        	 		    19
-#define ED_ADDPLACE_PORT        	 		    20
-#define FT_ADDPLACE_PATH        	 		    21
-#define ED_ADDPLACE_PATH        	 		    22
-#define CB_ADDPLACE_DAVS        	 		    23
-#define FT_ADDPLACE_USERNAME                    24
-#define ED_ADDPLACE_USERNAME                    25
-#define ED_ADDPLACE_SMBHOST        	 		    26
-#define FT_ADDPLACE_SHARE       	 		    27
-#define ED_ADDPLACE_SHARE       	 		    28
-#define FT_ADDPLACE_SMBPATH        	 		    29
-#define ED_ADDPLACE_SMBPATH        	 		    30
-#define FT_ADDPLACE_CMIS_BINDING                31
-#define ED_ADDPLACE_CMIS_BINDING                32
-#define FT_ADDPLACE_CMIS_REPOSITORY             33
-#define LB_ADDPLACE_CMIS_REPOSITORY             34
-#define BT_ADDPLACE_CMIS_REPOREFRESH            35
-
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/PlaceEditDialog.src b/svtools/source/dialogs/PlaceEditDialog.src
deleted file mode 100644
index cf3bf9a..0000000
--- a/svtools/source/dialogs/PlaceEditDialog.src
+++ /dev/null
@@ -1,223 +0,0 @@
-
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * [ Copyright (C) 2012 SUSE <cbosdonnat at suse.com> (initial developer) ]
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "PlaceEditDialog.hrc"
-
-// Place Edit Dialog --------------------------------------------------------------
-
-ModalDialog DLG_FPICKER_PLACE_EDIT
-{
-    OutputSize = TRUE ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Sizeable = TRUE;
-    Size = MAP_APPFONT ( 200 , 76 ) ;
-    FixedText FT_ADDPLACE_SERVERNAME
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
-        Text [ en-US ] = "Name" ;
-    };
-    FixedText FT_ADDPLACE_SERVERTYPE
-    {
-        Pos = MAP_APPFONT ( 12 , 30 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
-        Text [ en-US ] = "Type" ;
-    };
-    FixedText FT_ADDPLACE_HOST
-    {
-        Pos = MAP_APPFONT ( 12 , 46 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
-        Text [ en-US ] = "Host" ;
-    };
-    Edit ED_ADDPLACE_HOST
-    {
-        Pos = MAP_APPFONT ( 55, 44 ) ;
-        Size = MAP_APPFONT ( 71 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_ADDPLACE_PORT
-    {
-        Pos = MAP_APPFONT ( 129 , 46 ) ;
-        Size = MAP_APPFONT ( 20 , 10 ) ;
-        Text [ en-US ] = "Port" ;
-    };
-    NumericField ED_ADDPLACE_PORT
-    {
-        Pos = MAP_APPFONT ( 152, 44 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Border = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 65535 ;
-    };
-    FixedText FT_ADDPLACE_PATH
-    {
-        Pos = MAP_APPFONT ( 12 , 62 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
-        Text [ en-US ] = "Path" ;
-    };
-    Edit ED_ADDPLACE_PATH
-    {
-        Pos = MAP_APPFONT ( 55, 60 ) ;
-        Size = MAP_APPFONT ( 137 , 12 ) ;
-        Border = TRUE ;
-    };
-    CheckBox CB_ADDPLACE_DAVS
-    {
-        Pos = MAP_APPFONT ( 55, 74 ) ;
-        Size = MAP_APPFONT ( 137 , 10 ) ;
-        Text[ en-US ] = "Secured WebDAV (HTTPS)" ;
-    };
-    Edit ED_ADDPLACE_SMBHOST
-    {
-        Pos = MAP_APPFONT ( 55, 44 ) ;
-        Size = MAP_APPFONT ( 137 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_ADDPLACE_SHARE
-    {
-        Pos = MAP_APPFONT ( 12 , 62 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
-        Text [ en-US ] = "Share" ;
-    };
-    Edit ED_ADDPLACE_SHARE
-    {
-        Pos = MAP_APPFONT ( 55, 60 ) ;
-        Size = MAP_APPFONT ( 137 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_ADDPLACE_SMBPATH
-    {
-        Pos = MAP_APPFONT ( 12 , 78 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
-        Text [ en-US ] = "Path" ;
-    };
-    Edit ED_ADDPLACE_SMBPATH
-    {
-        Pos = MAP_APPFONT ( 55, 76 ) ;
-        Size = MAP_APPFONT ( 137 , 12 ) ;
-        Border = TRUE ;
-    };
-    Edit ED_ADDPLACE_SERVERNAME
-    {
-        Pos = MAP_APPFONT ( 55, 12 ) ;
-        Size = MAP_APPFONT ( 137 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_ADDPLACE_CMIS_BINDING
-    {
-        Pos = MAP_APPFONT ( 12 , 46 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
-        Text [ en-US ] = "Binding URL" ;
-    };
-    Edit ED_ADDPLACE_CMIS_BINDING
-    {
-        Pos = MAP_APPFONT ( 55, 44 ) ;
-        Size = MAP_APPFONT ( 137 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_ADDPLACE_CMIS_REPOSITORY
-    {
-        Pos = MAP_APPFONT ( 12 , 62 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
-        Text [ en-US ] = "Repository" ;
-    };
-    ListBox LB_ADDPLACE_CMIS_REPOSITORY
-    {
-        Pos = MAP_APPFONT ( 55, 60 ) ;
-        Size = MAP_APPFONT ( 122 , 75 ) ;
-        Border = TRUE ;
-        DropDown = TRUE;
-    };
-    ImageButton BT_ADDPLACE_CMIS_REPOREFRESH
-    {
-        Pos = MAP_APPFONT ( 180, 60 ) ;
-        Size = MAP_APPFONT ( 12, 12 );
-        TabStop = FALSE ;
-        QuickHelpText [ en-US ] = "Refresh" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "reload.png" ;
-            };
-            MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } ;
-        };
-    };
-    ListBox LB_ADDPLACE_SERVERTYPE
-    {
-        Pos = MAP_APPFONT ( 55, 28 ) ;
-        Size = MAP_APPFONT ( 137 , 75 ) ;
-        Border = TRUE ;
-        DropDown = TRUE;
-        StringList [ en-US ] =
-        {
-            < "WebDAV" ; >;
-            < "FTP" ; >;
-            < "SSH" ; >;
-            < "Windows Share" ; >;
-            < "CMIS (Atom Binding)" ; >;
-        };
-    };
-    FixedText FT_ADDPLACE_USERNAME
-    {
-        Pos = MAP_APPFONT ( 12 , 46 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
-        Text [ en-US ] = "Login" ;
-    };
-    Edit ED_ADDPLACE_USERNAME
-    {
-        Pos = MAP_APPFONT ( 55, 44 ) ;
-        Size = MAP_APPFONT ( 137 , 12 ) ;
-        Border = TRUE ;
-    };
-    OKButton BT_ADDPLACE_OK
-    {
-        Pos = MAP_APPFONT ( 80 , 60 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    CancelButton BT_ADDPLACE_CANCEL
-    {
-        Pos = MAP_APPFONT ( 140, 60 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    PushButton BT_ADDPLACE_DELETE
-    {
-        Pos = MAP_APPFONT ( 10 , 60 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "Delete" ;
-    };
-};
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 056f7f9..297e750 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -38,8 +38,6 @@
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 
-#include "PlaceEditDialog.hrc"
-
 #include "PlaceEditDialog.hxx"
 #include "ServerDetailsControls.hxx"
 


More information about the Libreoffice-commits mailing list