diff options
| author | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-02-25 19:54:08 +0100 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-02-25 19:54:08 +0100 |
| commit | 5879e44bafec55e5a9b76cb38c992645948ec607 (patch) | |
| tree | fb4b3eb2b43104421a8cb979ea9b082290cac49b /sw/source/ui/uiview/viewsrch.cxx | |
| parent | a00760d9c1a79cb4e54c6e7c55772b81caf3dce7 (diff) | |
| parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) | |
sw33a11y01: merge with DEV300_m72, resolution of merge conflicts, adjustments due to changes on master
Diffstat (limited to 'sw/source/ui/uiview/viewsrch.cxx')
| -rw-r--r-- | sw/source/ui/uiview/viewsrch.cxx | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index 62ec93d2a7f8..57c7bd20623c 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.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: viewsrch.cxx,v $ - * $Revision: 1.32 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,23 +32,23 @@ #include <string> // HACK: prevent conflict between STLPORT and Workshop headers #include <hintids.hxx> #include <com/sun/star/util/SearchOptions.hpp> -#include <svtools/cjkoptions.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/ctloptions.hxx> #include <svx/pageitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #ifndef _T2XTCMP_HXX //autogen #include <svtools/txtcmp.hxx> #endif -#include <svtools/itempool.hxx> -#include <svtools/eitem.hxx> -#include <svx/srchitem.hxx> +#include <svl/itempool.hxx> +#include <svl/eitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/request.hxx> #include <svx/srchdlg.hxx> #include <vcl/msgbox.hxx> #include <vcl/wrkwin.hxx> -#include "svx/unolingu.hxx" +#include "editeng/unolingu.hxx" #include <swmodule.hxx> #include <swwait.hxx> #include <workctrl.hxx> @@ -428,7 +425,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage) } break; default: -#ifndef PRODUCT +#ifdef DBG_UTIL if(nSlot) { ByteString sStr( "nSlot: " ); |