[Libreoffice-commits] .: 2 commits - sfx2/source
Takeshi Abe
tabe at kemper.freedesktop.org
Mon Apr 9 14:53:41 PDT 2012
sfx2/source/appl/impldde.cxx | 3 -
sfx2/source/appl/sfxhelp.cxx | 3 -
sfx2/source/appl/shutdowniconOs2.cxx | 94 -----------------------------------
sfx2/source/bastyp/frmhtml.cxx | 3 -
sfx2/source/bastyp/progress.cxx | 8 --
sfx2/source/doc/docfile.cxx | 3 -
sfx2/source/doc/doctempl.cxx | 2
sfx2/source/doc/docvor.cxx | 1
sfx2/source/doc/frmdescr.cxx | 2
sfx2/source/doc/oleprops.cxx | 1
10 files changed, 120 deletions(-)
New commits:
commit e194f5bda1c7cb218f649d316122513f571c5180
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Apr 10 06:50:53 2012 +0900
removed unused defines
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index ee4c3db..9184f57 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -54,9 +54,6 @@
#include <svl/svdde.hxx>
#include <sot/formats.hxx>
-#define DDELINK_COLD 0
-#define DDELINK_HOT 1
-
#define DDELINK_ERROR_APP 1
#define DDELINK_ERROR_DATA 2
#define DDELINK_ERROR_LINK 3
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 80a8f88..1335e1f 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -86,9 +86,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::system;
-#define ERROR_TAG String( DEFINE_CONST_UNICODE("Error: ") )
-#define PATH_TAG String( DEFINE_CONST_UNICODE("\nPath: ") )
-
class NoHelpErrorBox : public ErrorBox
{
public:
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index d8b9e18..dc24e35 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -40,9 +40,6 @@
#include <sfx2/fcontnr.hxx>
#include "sfxtypes.hxx"
-#define SFX_HTMLFRMSIZE_REL 0x0001
-#define SFX_HTMLFRMSIZE_PERCENT 0x0002
-
static sal_Char const sHTML_SC_yes[] = "YES";
static sal_Char const sHTML_SC_no[] = "NO";
static sal_Char const sHTML_SC_auto[] = "AUTO";
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 22025a6..f31b125 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -82,17 +82,9 @@ struct SfxProgress_Impl
//========================================================================
-#define TIMEOUT_PROGRESS 5L /* 10th s */
-#define MAXPERCENT_PROGRESS 33
-
-#define TIMEOUT_RESCHEDULE 10L /* 10th s */
-#define MAXPERCENT_RESCHEDULE 50
-
#define Progress
#include "sfxslots.hxx"
-#define aTypeLibInfo aProgressTypeLibImpl
-
//========================================================================
extern sal_uInt32 Get10ThSec();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 2dc3572..0f30aab 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -137,9 +137,6 @@ using namespace ::com::sun::star::io;
#include "sfxacldetect.hxx"
#include "officecfg/Office/Common.hxx"
-#define MAX_REDIRECT 5
-
-
//==========================================================
namespace {
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index e2733a6..9d3230d 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -106,8 +106,6 @@ using ::std::advance;
//========================================================================
-// #define DONT_USE_HIERARCHY
-
#define TITLE "Title"
#define IS_FOLDER "IsFolder"
#define PROPERTY_TYPE "TypeDescription"
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 00a0037..e9ee57d 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -73,7 +73,6 @@
#include <comphelper/processfactory.hxx>
#include <svl/svstdarr.hxx>
-static const char cDelim = ':';
sal_Bool SfxOrganizeListBox_Impl::bDropMoveOk = sal_True;
using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 760869f..e4f73a2 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -37,8 +37,6 @@
DBG_NAME(SfxFrameDescriptor);
-#define VERSION (sal_uInt16) 3
-
struct SfxFrameDescriptor_Impl
{
Wallpaper* pWallpaper;
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index cab4f0a..6a8cf46 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -40,7 +40,6 @@
// ============================================================================
-#define VERSION 11
#define STREAM_BUFFER_SIZE 2048
// usings
commit e5c6f53714335360c360e99b851da64bd2ccf74f
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Apr 10 06:29:09 2012 +0900
removed OS/2 one
diff --git a/sfx2/source/appl/shutdowniconOs2.cxx b/sfx2/source/appl/shutdowniconOs2.cxx
deleted file mode 100644
index 56932ff..0000000
--- a/sfx2/source/appl/shutdowniconOs2.cxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-
-#include <unotools/moduleoptions.hxx>
-
-#include <unotools/dynamicmenuoptions.hxx>
-
-#include "shutdownicon.hxx"
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/task/XJob.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-
-
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::osl;
-
-// This ObjectID must match the one created in WarpIN scripts!!
-#define QUICKSTART_OBJID "OO2_QUICKSTART"
-
-bool ShutdownIcon::IsQuickstarterInstalled()
-{
- HOBJECT hObject;
- // Check quickstart icon presence
- hObject = WinQueryObject( "<" QUICKSTART_OBJID ">");
- if (hObject)
- return true;
- // object not found, quickstart not available
- return false;
-}
-
-void ShutdownIcon::SetAutostartOs2( bool bActivate )
-{
- HOBJECT hObject;
-
- if( bActivate && IsQuickstarterInstalled() )
- {
- // place quickstart shadow in the startup folder
- hObject = WinCreateObject( "WPShadow", "dummy",
- "OBJECTID=<" QUICKSTART_OBJID "_SHW>;SHADOWID=<" QUICKSTART_OBJID ">;",
- "<WP_START>",
- CO_UPDATEIFEXISTS);
- }
- else
- {
- // remove quickstart shadow from the startup folder
- hObject = WinQueryObject( "<" QUICKSTART_OBJID "_SHW>");
- if (hObject)
- WinDestroyObject( hObject);
- }
-}
-
-bool ShutdownIcon::GetAutostartOs2( )
-{
- // check for quickstart shadow in the startup folder
- if (WinQueryObject( "<" QUICKSTART_OBJID "_SHW>"))
- return true;
- else
- return false;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list