From ed87eb8f7aec4990f65ed9c5b90738eab8b59e21 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Oct 2009 00:05:16 +0200 Subject: #i103496#: split svtools; improve ConfitItems --- sw/source/ui/uiview/viewling.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sw/source/ui/uiview/viewling.cxx') diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 588c30a9844d..09014ea3afcf 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -36,7 +36,7 @@ #ifndef _SVSTDARR_HXX #define _SVSTDARR_STRINGSDTOR -#include +#include #endif #include #include @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include -- cgit From 4058a9b1950da57bfcf3a8365954cb462d8cfa23 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 10 Dec 2009 18:36:58 +0100 Subject: #i107450#: move GetLanguageString to class SvtLanguageTable --- sw/source/ui/uiview/viewling.cxx | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'sw/source/ui/uiview/viewling.cxx') diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 09014ea3afcf..780805305412 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -61,16 +61,10 @@ #include #include // fuer SpellPointer #include -#ifndef _VIEW_HXX #include -#endif #include -#ifndef _BASESH_HXX #include -#endif -#ifndef _DOCSH_HXX #include // CheckSpellChanges -#endif #include // Viewoptions #include // fuer Undo-Ids #include // Trennung @@ -80,18 +74,10 @@ #include #include -#ifndef _CMDID_H #include -#endif -#ifndef _GLOBALS_HRC #include -#endif -#ifndef _COMCORE_HRC #include // STR_MULT_INTERACT_SPELL_WARN -#endif -#ifndef _VIEW_HRC #include -#endif #include #include @@ -112,7 +98,7 @@ #include #include "stmenu.hxx" // PopupMenu for smarttags #include - +#include #include #include @@ -418,7 +404,7 @@ IMPL_LINK( SwView, SpellError, LanguageType *, pLang ) while( pWrtShell->ActionPend() ); } LanguageType eLang = pLang ? *pLang : LANGUAGE_NONE; - String aErr(::GetLanguageString( eLang ) ); + String aErr(SvtLanguageTable::GetLanguageString( eLang ) ); SwEditWin &rEditWin = GetEditWin(); #if OSL_DEBUG_LEVEL > 1 -- cgit From 529eb419a8f88fa34f57af5dc25dfec41d90d4bc Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 10 Dec 2009 19:12:58 +0100 Subject: #i107450#: move ThesaurusDialog and HyphenWordDialog to cui --- sw/source/ui/uiview/viewling.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sw/source/ui/uiview/viewling.cxx') diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 780805305412..a9de5d048a3a 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include @@ -600,7 +600,7 @@ void SwView::StartThesaurus() pWrtShell->GetSelTxt() : pWrtShell->GetCurWord(); Reference< XThesaurus > xThes( ::GetThesaurus() ); - SvxThesaurusDialog *pDlg = NULL; + AbstractThesaurusDialog *pDlg = NULL; if ( !xThes.is() || !xThes->hasLocale( SvxCreateLocale( eLang ) ) ) { @@ -611,7 +611,8 @@ void SwView::StartThesaurus() // create dialog { //Scope for SwWait-Object SwWait aWait( *GetDocShell(), sal_True ); - pDlg = new SvxThesaurusDialog( &GetEditWin(), + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + pDlg = pFact->CreateThesaurusDialog( &GetEditWin(), xThes, aTmp, eLang ); } @@ -637,12 +638,12 @@ void SwView::StartThesaurus() else aWinTop.Y() = aBtmPos.Y(); - Size aSz = pDlg->GetSizePixel(); + Size aSz = pDlg->GetWindow()->GetSizePixel(); if ( aWinBtm.Y() - aWinTop.Y() > aSz.Height() ) { aWinTop.X() = ( aWinTop.X() + aWinBtm.X() - aSz.Width() ) / 2; aWinTop.Y() = ( aWinTop.Y() + aWinBtm.Y() - aSz.Height() ) / 2; - pDlg->SetPosPixel( aWinTop ); + pDlg->GetWindow()->SetPosPixel( aWinTop ); } } -- cgit From 55f1f483cfa4cde111593782f17c514a0056d7f0 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 8 Jan 2010 18:32:51 +0100 Subject: #i107450#: build all other modules with new editeng lib --- sw/source/ui/uiview/viewling.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sw/source/ui/uiview/viewling.cxx') diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index a9de5d048a3a..09b19bf615f3 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -52,11 +52,11 @@ #include #include #include -#include +#include #include -#include +#include #include -#include +#include #include #include #include // fuer SpellPointer @@ -102,6 +102,7 @@ #include #include +#include using ::rtl::OUString; using namespace ::com::sun::star; -- cgit From 1a359bd2a8d7621574942287703e7df69ebffa16 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 12 Feb 2010 15:01:35 +0100 Subject: changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) --- sw/source/ui/uiview/viewling.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sw/source/ui/uiview/viewling.cxx') diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 09014ea3afcf..a2134c590ad1 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.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: viewling.cxx,v $ - * $Revision: 1.38 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify -- cgit