diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-01-12 14:07:54 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-01-12 14:07:54 +0100 |
| commit | 7a0436ff74b08cc03fd14730e14fcc8b558a2ecb (patch) | |
| tree | 2375be4bef7cfc7dba76019d0e3a8183d6da89f7 /sw | |
| parent | 3aa0aa1db307d2d88c612b808ec06411b3036b97 (diff) | |
cws tl74: build errors/warnings after merge
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/shells/drwtxtex.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/shells/textsh1.cxx | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 1f30dff31930..4abef9982d8b 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -42,12 +42,15 @@ #include <svl/whiter.hxx> #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> -#include <svl/langtab.hxx> +#include <svtools/langtab.hxx> #include <svl/languageoptions.hxx> #include <sfx2/bindings.hxx> #include <vcl/msgbox.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> +#include <svx/adjitem.hxx> +#include <svx/brkitem.hxx> +#include <svx/escpitem.hxx> #include <svx/flditem.hxx> #include <svx/fontitem.hxx> #include <svx/frmdiritem.hxx> diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 3de0c2fd5b28..a98f201d3959 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -414,10 +414,10 @@ void SwTextShell::Execute(SfxRequest &rReq) aReplaceText = pItem2->GetValue(); if (aReplaceText.Len() > 0) { - SwView &rView = rWrtSh.GetView(); + SwView &rView2 = rWrtSh.GetView(); const bool bSelection = rWrtSh.HasSelection(); - const String aLookUpText = rView.GetThesaurusLookUpText( bSelection ); - rView.InsertThesaurusSynonym( aReplaceText, aLookUpText, bSelection ); + const String aLookUpText = rView2.GetThesaurusLookUpText( bSelection ); + rView2.InsertThesaurusSynonym( aReplaceText, aLookUpText, bSelection ); } } break; |