diff options
-rw-r--r-- | dbaccess/source/ui/browser/sbagrid.cxx | 15 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/JoinExchange.cxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun3.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/view/sdview3.cxx | 1 | ||||
-rw-r--r-- | svx/Package_inc.mk | 1 | ||||
-rw-r--r-- | svx/inc/svx/dbexch.hrc | 57 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 1 | ||||
-rw-r--r-- | svx/source/form/fmexch.cxx | 1 |
13 files changed, 0 insertions, 83 deletions
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 4c11b2933246..4e37c5677438 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -75,7 +75,6 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <vcl/msgbox.hxx> -#include <svx/dbexch.hrc> #include "dbu_brw.hrc" #include "browserids.hxx" #include "dbustrings.hrc" @@ -1459,20 +1458,6 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) nAction = DND_ACTION_COPY; } -/* - // check formats - SvDataObjectRef xDataObj = SvDataObject::PasteDragServer( rEvt ); - if (!xDataObj.Is()) - return sal_False; - - const SvDataTypeList& rTypeList = xDataObj->GetTypeList(); - if ((rTypeList.Get(Exchange::RegisterFormatName(String::CreateFromAscii(SBA_DATAEXCHANGE_FORMAT)))) ) - { - bAllow = (GetOptions() & OPT_INSERT) && rEvt.GetColumnId() > 0 && rEvt.GetRow() >= 0; - ((BrowserDropEvent&)rEvt).SetAction(DROP_COPY); - } - -*/ return (DND_ACTION_NONE != nAction) ? nAction : FmGridControl::AcceptDrop(rEvt); } diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index efed1cf97ada..82100a1e053a 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -19,7 +19,6 @@ #include "JoinExchange.hxx" #include <sot/formats.hxx> -#include <svx/dbexch.hrc> #include <cppuhelper/typeprovider.hxx> namespace dbaui diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 9040f059e98e..5d1c492f0348 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -36,7 +36,6 @@ #include "QTableWindow.hxx" #include <vcl/msgbox.hxx> #include "QueryDesignFieldUndoAct.hxx" -#include <svx/dbexch.hrc> #include "sqlmessage.hxx" #include "UITools.hxx" #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 3e54fcacc3c7..87ca37dbba6b 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -25,7 +25,6 @@ #include "JoinExchange.hxx" #include <osl/diagnose.h> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <svx/dbexch.hrc> #include <vcl/svapp.hxx> using namespace dbaui; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 12168f8446c6..6187397979e8 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -32,7 +32,6 @@ #include <memory> //auto_ptr #include <editeng/adjitem.hxx> #include <svx/algitem.hxx> -#include <svx/dbexch.hrc> #include <editeng/editview.hxx> #include <editeng/editstat.hxx> #include <editeng/flditem.hxx> diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 77efccc06261..45be517d783f 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -124,7 +124,6 @@ #define _SVX_THESDLG_HXX #include "scitems.hxx" -#include <svx/dbexch.hrc> #include <svx/svdetc.hxx> #include <svx/svditer.hxx> #include <svx/svdoole2.hxx> diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index f8277d951dfe..61e672d813d7 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -35,7 +35,6 @@ //------------------------------------------------------------------ -#include <svx/dbexch.hrc> #include <svx/fmmodel.hxx> #include <svx/svdetc.hxx> #include <svx/svditer.hxx> diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 9ae31f97a313..add2740361cc 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -46,7 +46,6 @@ #include <svl/urlbmk.hxx> #include <editeng/outliner.hxx> #include <svx/xflclit.hxx> -#include <svx/dbexch.hrc> #include <sot/formats.hxx> #include <editeng/editeng.hxx> #include <svx/svditer.hxx> diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 58d434ce6654..356edddb24fa 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -57,7 +57,6 @@ #include <editeng/editeng.hxx> #include <svx/obj3d.hxx> #include <svx/e3dundo.hxx> -#include <svx/dbexch.hrc> #include <svx/unomodel.hxx> #include <unotools/streamwrap.hxx> #include <vcl/metaact.hxx> diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index 0b8014aac316..4c14c7879c3e 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -171,7 +171,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/srchdlg.hxx,svx/srchdlg.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcaitm.hxx,svx/sxcaitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/subtoolboxcontrol.hxx,svx/subtoolboxcontrol.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasaitm.hxx,svx/sdasaitm.hxx)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbexch.hrc,svx/dbexch.hrc)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomaster.hxx,svx/unomaster.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedtv.hxx,svx/svdedtv.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlinjoit.hxx,svx/xlinjoit.hxx)) diff --git a/svx/inc/svx/dbexch.hrc b/svx/inc/svx/dbexch.hrc deleted file mode 100644 index faa2274987cd..000000000000 --- a/svx/inc/svx/dbexch.hrc +++ /dev/null @@ -1,57 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_DBEXCH_HRC -#define _SVX_DBEXCH_HRC - -// Format zum Uebertragen von Daten aus dem DatenbankBrowser -// Format: "Datenbankname";"Tabellen/QueryName"; 1/0(fuer Tabelle/Abfrage); SQL-Statement;Selektionsliste -// Name der Tabelle kann leer sein -// Feldtrenner ist "ASCII 11" !!!! -// Selektionsliste:"" // alle selektiert -// | "1;2;...n" // Selektierte Saetze, Start bei 1 -#define SBA_DATAEXCHANGE_FORMAT "SBA-DATAFORMAT" - -// Feldtrenner ist "ASCII 11" !!!! -// Format zum Uebertragen von Feldname aus dem DatenbankBrowser -// "Datenbankname";"Tabellen/QueryName";0(Tabelle) / 1(Abfrage) / 2(SQL) / 3(NATIVE_SQL);"Feldname" -#define SBA_FIELDEXCHANGE_FORMAT "SBA-FIELDFORMAT" - -// Feldtrenner ist "ASCII 11" !!!! -// Format zum Uebertragen von Feldinhalten aus dem DatenbankBrowser -// "Datenbankname";"Tabellen/QueryName";1/0(fuer Tabelle/Abfrage);"Feldname";"FeldInhalt" -#define SBA_FIELDDATAEXCHANGE_FORMAT "SBA-FIELDDATAFORMAT" - -// Office-internes Format (entspricht der private-URL ) -// Wird vom Writer und Calc benutzt, wenn Explorer-Contents gedraggt werden -#define SBA_PRIVATEURL_EXCHANGE_FORMAT "SBA-PRIVATEURLFORMAT" - -// SBA-internes Format fuer das erzeugen von Joins in der RelationsShell -#define SBA_JOIN_EXCHANGE_FORMAT "SBA-JOINFORMAT" - - -#endif // _SVX_DBEXCH_HRC - diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 8bc620b669de..1652512ea5ef 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include "svx/dbexch.hrc" #include "svx/fmgridif.hxx" #include "fmitems.hxx" #include "fmprop.hrc" diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 6d48d04ca3c8..c13198482aa8 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -31,7 +31,6 @@ #include <sot/storage.hxx> #include <svl/itempool.hxx> -#include <svx/dbexch.hrc> #include <sot/formats.hxx> #include <svtools/svtreebx.hxx> #include <tools/diagnose_ex.h> |