diff options
author | Malte Timmermann [mt] <malte.timmermann@sun.com> | 2010-03-02 20:27:28 +0100 |
---|---|---|
committer | Malte Timmermann [mt] <malte.timmermann@sun.com> | 2010-03-02 20:27:28 +0100 |
commit | d2661f59f9dbad100cc166bd54511897025b9aa2 (patch) | |
tree | a36f1853064cd1f072006ac8b8e666bb61a6cecd /cui/source/inc/hangulhanjadlg.hxx | |
parent | 53cec388721ea68eb667d60eeb286c1bd24ffa02 (diff) | |
parent | 97412488d9fcd77c21dbeb821dec122008cd2e32 (diff) |
mtaccfixes: merge with DEV300_m73
Diffstat (limited to 'cui/source/inc/hangulhanjadlg.hxx')
-rw-r--r-- | cui/source/inc/hangulhanjadlg.hxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 6c87b8003479..287fa206f148 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -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: hangulhanjadlg.hxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -37,9 +34,9 @@ #include <vcl/fixed.hxx> #include <vcl/scrbar.hxx> #include <svx/checklbx.hxx> -#include <svx/hangulhanja.hxx> +#include <editeng/hangulhanja.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <com/sun/star/linguistic2/XConversionDictionaryList.hpp> #include <svtools/valueset.hxx> @@ -146,7 +143,7 @@ namespace svx public: HangulHanjaConversionDialog( Window* _pParent, - HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); + editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); ~HangulHanjaConversionDialog( ); public: @@ -173,20 +170,20 @@ namespace svx // retrieves the current suggestion String GetCurrentSuggestion( ) const; - void SetConversionFormat( HangulHanjaConversion::ConversionFormat _eType ); - HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const; + void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ); + editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const; void SetByCharacter( sal_Bool _bByCharacter ); sal_Bool GetByCharacter( ) const; - void SetConversionDirectionState( sal_Bool _bTryBothDirections, HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); + void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); // should text which does not match the primary conversion direction be ignored? sal_Bool GetUseBothDirections( ) const; // get current conversion direction to use // (return argument if GetUseBothDirections is true) - HangulHanjaConversion::ConversionDirection GetDirection( HangulHanjaConversion::ConversionDirection eDefaultDirection ) const; + editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection eDefaultDirection ) const; // enables or disbales the checkboxes for ruby formatted replacements void EnableRubySupport( sal_Bool bVal ); |