diff options
author | Thomas Benisch <tbe@openoffice.org> | 2010-03-01 12:22:02 +0100 |
---|---|---|
committer | Thomas Benisch <tbe@openoffice.org> | 2010-03-01 12:22:02 +0100 |
commit | 9894a711a7550c717381e80c38c981e6b502beb7 (patch) | |
tree | 781477b79027c5c1101d211c79603c366a002aeb /sw/source/ui/docvw/edtwin2.cxx | |
parent | 04d7fd9828cdb09ff190bc65975e0c51df778487 (diff) | |
parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) |
chartshapes: merge with DEV300_m72
Diffstat (limited to 'sw/source/ui/docvw/edtwin2.cxx')
-rw-r--r-- | sw/source/ui/docvw/edtwin2.cxx | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index 13f832acfccf..d605ef993457 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: edtwin2.cxx,v $ - * $Revision: 1.31.130.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,26 +31,26 @@ #include <hintids.hxx> #include <doc.hxx> -#ifndef PRODUCT +#ifdef DBG_UTIL #include <stdio.h> #endif #ifndef _HELP_HXX //autogen #include <vcl/help.hxx> #endif -#include <svtools/stritem.hxx> -#include <svtools/securityoptions.hxx> +#include <svl/stritem.hxx> +#include <unotools/securityoptions.hxx> #include <tools/urlobj.hxx> #include <txtrfmrk.hxx> #include <fmtrfmrk.hxx> -#include <svx/flditem.hxx> -#include <svtools/urihelper.hxx> +#include <editeng/flditem.hxx> +#include <svl/urihelper.hxx> #include <svx/svdotext.hxx> #ifndef _OUTLINER_HXX //autogen #define _EEITEMID_HXX -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #endif -#include <svtools/itemiter.hxx> +#include <svl/itemiter.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <swmodule.hxx> @@ -162,7 +159,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) SwContentAtPos::SW_TOXMARK | SwContentAtPos::SW_REFMARK | SwContentAtPos::SW_SMARTTAG | -#ifndef PRODUCT +#ifdef DBG_UTIL SwContentAtPos::SW_TABLEBOXVALUE | ( bBalloon ? SwContentAtPos::SW_CURR_ATTRS : 0) | #endif @@ -176,7 +173,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) sTxt.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "= " )); sTxt += ((SwTblBoxFormula*)aCntntAtPos.aFnd.pAttr)->GetFormula(); break; -#ifndef PRODUCT +#ifdef DBG_UTIL case SwContentAtPos::SW_TABLEBOXVALUE: { sTxt = UniString( |