You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/03/15 10:24:56 UTC
svn commit: r1456826 [2/6] - in /openoffice/branches/l10n/main: ./
autodoc/source/display/html/ automation/packimages/ automation/prj/
automation/source/communi/ automation/source/miniapp/
automation/source/testtool/ automation/util/ bridges/source/cpp...
Modified: openoffice/branches/l10n/main/editeng/source/outliner/outleeng.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/editeng/source/outliner/outleeng.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/editeng/source/outliner/outleeng.cxx (original)
+++ openoffice/branches/l10n/main/editeng/source/outliner/outleeng.cxx Fri Mar 15 09:24:52 2013
@@ -53,7 +53,7 @@ OutlinerEditEng::~OutlinerEditEng()
void OutlinerEditEng::PaintingFirstLine( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
{
- if( GetControlWord() && EE_CNTRL_OUTLINER )
+ if( GetControlWord() & EE_CNTRL_OUTLINER )
{
PaintFirstLineInfo aInfo( nPara, rStartPos, nBaseLineY, rOrigin, nOrientation, pOutDev );
pOwner->maPaintFirstLineHdl.Call( &aInfo );
Modified: openoffice/branches/l10n/main/extensions/source/activex/main/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/extensions/source/activex/main/makefile.mk?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/extensions/source/activex/main/makefile.mk (original)
+++ openoffice/branches/l10n/main/extensions/source/activex/main/makefile.mk Fri Mar 15 09:24:52 2013
@@ -137,8 +137,10 @@ SHL1STDLIBS_X64+=\
SHL1OBJS_X64=$(SLOFILES_X64)
SHL1DEF_X64=$(TARGET).def
-SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib
-
+SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atls.lib
+.IF "$(HAVE_ATLTHUNK)" == "YES"
+ SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atlthunk.lib
+.ENDIF
.ENDIF # "$(BUILD_X64)"!=""
# --- Targets ----------------------------------
Modified: openoffice/branches/l10n/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/external_deps.lst?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/external_deps.lst (original)
+++ openoffice/branches/l10n/main/external_deps.lst Fri Mar 15 09:24:52 2013
@@ -126,9 +126,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- SHA1 = 231af70b7567a753b49df4216743010c193884b7
- name = serf-1.1.0.tar.bz2
- URL1 = http://serf.googlecode.com/files/serf-1.1.0.tar.bz2
+ SHA1 = 30b29bd9214d50887abcc20cf82096aaaf5d1d61
+ name = serf-1.2.0.tar.bz2
+ URL1 = http://serf.googlecode.com/files/serf-1.2.0.tar.bz2
URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))
Modified: openoffice/branches/l10n/main/filter/source/graphicfilter/ieps/ieps.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/graphicfilter/ieps/ieps.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/graphicfilter/ieps/ieps.cxx (original)
+++ openoffice/branches/l10n/main/filter/source/graphicfilter/ieps/ieps.cxx Fri Mar 15 09:24:52 2013
@@ -204,7 +204,7 @@ static bool RenderAsEMF(const sal_uInt8*
TempFile aTemp;
aTemp.EnableKillingFile();
rtl::OUString fileName =
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pstoedit"EXESUFFIX));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "pstoedit" EXESUFFIX));
rtl::OUString arg1 =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-f"));
rtl::OUString arg2 =
@@ -305,7 +305,7 @@ static bool RenderAsPNGThroughConvert(co
Graphic &rGraphic)
{
rtl::OUString fileName =
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("convert"EXESUFFIX));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "convert" EXESUFFIX));
// density in pixel/inch
rtl::OUString arg1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-density"));
// since the preview is also used for PDF-Export & printing on non-PS-printers,
@@ -328,10 +328,10 @@ static bool RenderAsPNGThroughGS(const s
{
#ifdef WNT
rtl::OUString fileName =
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gswin32c"EXESUFFIX));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "gswin32c" EXESUFFIX));
#else
rtl::OUString fileName =
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gs"EXESUFFIX));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "gs" EXESUFFIX));
#endif
rtl::OUString arg1 =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-q"));
Modified: openoffice/branches/l10n/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/msfilter/msdffimp.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/msfilter/msdffimp.cxx (original)
+++ openoffice/branches/l10n/main/filter/source/msfilter/msdffimp.cxx Fri Mar 15 09:24:52 2013
@@ -1709,7 +1709,7 @@ void DffPropertyReader::ApplyCustomShape
{
const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) );
double fBackDepth = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DExtrudeBackward, 1270 * 360 )) / 360.0;
- double fForeDepth = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DExtrudeForward ), 0 ) / 360.0;
+ double fForeDepth = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DExtrudeForward, 0 )) / 360.0;
double fDepth = fBackDepth + fForeDepth;
double fFraction = fDepth != 0.0 ? fForeDepth / fDepth : 0;
EnhancedCustomShapeParameterPair aDepthParaPair;
Modified: openoffice/branches/l10n/main/filter/source/xsltfilter/uof2splithandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/xsltfilter/uof2splithandler.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/xsltfilter/uof2splithandler.cxx (original)
+++ openoffice/branches/l10n/main/filter/source/xsltfilter/uof2splithandler.cxx Fri Mar 15 09:24:52 2013
@@ -48,8 +48,8 @@ using namespace ::rtl;
UOF2SplitHandler::UOF2SplitHandler(
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rMultiFactory,
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rStream )
-: m_rMultiFactory( rMultiFactory )
-, m_rStream( rStream )
+: m_rStream( rStream )
+, m_rMultiFactory( rMultiFactory )
, m_bIsStart( sal_False )
{
_Init();
@@ -240,4 +240,4 @@ void UOF2SplitHandler::namespaceMap( con
}
}
}
-}
\ No newline at end of file
+}
Modified: openoffice/branches/l10n/main/formula/source/core/resource/core_resource.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/formula/source/core/resource/core_resource.src?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/formula/source/core/resource/core_resource.src (original)
+++ openoffice/branches/l10n/main/formula/source/core/resource/core_resource.src Fri Mar 15 09:24:52 2013
@@ -858,19 +858,19 @@ Resource RID_STRLIST_FUNCTION_NAMES
};
String SC_OPCODE_COSECANT
{
- Text = "CSC" ;
+ Text [ en-US ] = "CSC" ;
};
String SC_OPCODE_SECANT
{
- Text = "SEC" ;
+ Text [ en-US ] = "SEC" ;
};
String SC_OPCODE_COSECANT_HYP
{
- Text = "CSCH" ;
+ Text [ en-US ] = "CSCH" ;
};
String SC_OPCODE_SECANT_HYP
{
- Text = "SECH" ;
+ Text [ en-US ] = "SECH" ;
};
String SC_OPCODE_EXP
{
Modified: openoffice/branches/l10n/main/fpicker/source/aqua/CFStringUtilities.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/fpicker/source/aqua/CFStringUtilities.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/fpicker/source/aqua/CFStringUtilities.cxx (original)
+++ openoffice/branches/l10n/main/fpicker/source/aqua/CFStringUtilities.cxx Fri Mar 15 09:24:52 2013
@@ -86,7 +86,7 @@ rtl::OUString CFURLRefToOUString(CFURLRe
sURLString = CFURLGetString(aUrlRef);
CFRetain(sURLString);
break;
- case FILENAME:
+ case FILENAME: {
OSL_TRACE("Extracting the file name of an item");
CFStringRef fullString = CFURLGetString(aUrlRef);
CFURLRef dirRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
@@ -95,14 +95,14 @@ rtl::OUString CFURLRefToOUString(CFURLRe
CFIndex fullLength = CFStringGetLength(fullString);
CFRange substringRange = CFRangeMake(dirLength, fullLength - dirLength);
sURLString = CFStringCreateWithSubstring(NULL, fullString, substringRange);
- break;
- case PATHWITHOUTLASTCOMPONENT:
+ } break;
+ case PATHWITHOUTLASTCOMPONENT: {
OSL_TRACE("Extracting the last but one component of an item's path");
CFURLRef directoryRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
sURLString = CFURLGetString(directoryRef);
CFRetain(sURLString);
CFRelease(directoryRef);
- break;
+ } break;
default:
break;
}
Modified: openoffice/branches/l10n/main/fpicker/source/aqua/ControlHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/fpicker/source/aqua/ControlHelper.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/fpicker/source/aqua/ControlHelper.cxx (original)
+++ openoffice/branches/l10n/main/fpicker/source/aqua/ControlHelper.cxx Fri Mar 15 09:24:52 2013
@@ -217,7 +217,7 @@ OUString ControlHelper::getLabel( sal_In
return retVal;
}
-void ControlHelper::setLabel( sal_Int16 nControlId, const NSString* aLabel )
+void ControlHelper::setLabel( sal_Int16 nControlId, NSString* aLabel )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "label", aLabel);
@@ -954,7 +954,7 @@ void ControlHelper::createFilterControl(
DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
-NSTextField* ControlHelper::createLabelWithString(const NSString* labelString) {
+NSTextField* ControlHelper::createLabelWithString(NSString* labelString) {
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "label", labelString);
NSTextField *textField = [NSTextField new];
Modified: openoffice/branches/l10n/main/fpicker/source/aqua/ControlHelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/fpicker/source/aqua/ControlHelper.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/fpicker/source/aqua/ControlHelper.hxx (original)
+++ openoffice/branches/l10n/main/fpicker/source/aqua/ControlHelper.hxx Fri Mar 15 09:24:52 2013
@@ -62,7 +62,7 @@ public:
uno::Any getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) const;
void enableControl( sal_Int16 nControlId, sal_Bool bEnable ) const;
OUString getLabel( sal_Int16 nControlId );
- void setLabel( sal_Int16 nControlId, const NSString* aLabel );
+ void setLabel( sal_Int16 nControlId, NSString* aLabel );
//------------------------------------------------------------------------------------
// other stuff
@@ -179,7 +179,7 @@ private:
void createControls();
void createFilterControl();
void createUserPane();
- NSTextField* createLabelWithString(const NSString* label);
+ NSTextField* createLabelWithString( NSString* label);
int getControlElementName(const Class clazz, const int nControlId) const;
NSControl* getControl( const sal_Int16 nControlId ) const;
Modified: openoffice/branches/l10n/main/fpicker/source/aqua/NSURL_OOoAdditions.mm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/fpicker/source/aqua/NSURL_OOoAdditions.mm?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/fpicker/source/aqua/NSURL_OOoAdditions.mm (original)
+++ openoffice/branches/l10n/main/fpicker/source/aqua/NSURL_OOoAdditions.mm Fri Mar 15 09:24:52 2013
@@ -40,9 +40,9 @@
sURLString = [self absoluteString];
[sURLString retain];
break;
- case FILENAME:
+ case FILENAME: {
OSL_TRACE("Extracting the file name of an item");
- NSString *path = [self path];
+ NSString* path = [self path];
if (path == nil) {
sURLString = @"";
}
@@ -50,10 +50,10 @@
sURLString = [path lastPathComponent];
}
[sURLString retain];
- break;
- case PATHWITHOUTLASTCOMPONENT:
+ } break;
+ case PATHWITHOUTLASTCOMPONENT: {
OSL_TRACE("Extracting the last but one component of an item's path");
- path = [self absoluteString];
+ NSString* path = [self absoluteString];
if (path == nil) {
sURLString = @"";
}
@@ -63,7 +63,7 @@
sURLString = [path substringToIndex:([path length] - lastLength)];
}
[sURLString retain];
- break;
+ } break;
default:
break;
}
Modified: openoffice/branches/l10n/main/fpicker/source/aqua/SalAquaPicker.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/fpicker/source/aqua/SalAquaPicker.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/fpicker/source/aqua/SalAquaPicker.cxx (original)
+++ openoffice/branches/l10n/main/fpicker/source/aqua/SalAquaPicker.cxx Fri Mar 15 09:24:52 2013
@@ -109,7 +109,7 @@ void SAL_CALL SalAquaPicker::implInitial
[(NSOpenPanel*)m_pDialog setCanChooseFiles:YES];
break;
- case NAVIGATIONSERVICES_SAVE:
+ case NAVIGATIONSERVICES_SAVE: {
OSL_TRACE("NAVIGATIONSERVICES_SAVE");
m_pDialog = [NSSavePanel savePanel];
[(NSSavePanel*)m_pDialog setCanSelectHiddenExtension:NO]; //changed for issue #102102
@@ -128,7 +128,7 @@ void SAL_CALL SalAquaPicker::implInitial
OSL_TRACE("Hiding extension");
[pDefaults setBool:YES forKey:kSetHideExtensionStateKey];
}
- break;
+ } break;
case NAVIGATIONSERVICES_DIRECTORY:
OSL_TRACE("NAVIGATIONSERVICES_DIRECTORY");
Modified: openoffice/branches/l10n/main/framework/inc/properties.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/properties.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/properties.h (original)
+++ openoffice/branches/l10n/main/framework/inc/properties.h Fri Mar 15 09:24:52 2013
@@ -329,20 +329,6 @@ class PropHelper
return bChanged;
}
-
- //___________________________________________
-
- /** calculates the count of items inside the given ascii array.
- *
- * @param pArray must point to an array of items from type sal_Char
- *
- * @return The count of items inside this array, calculated by knowing the size of sal_Char.
- */
-
- static sal_Int32 calculatePropArrayCount( const sal_Char* pArray[] )
- {
- return (sal_Int32)(sizeof(pArray)/sizeof(sal_Char*));
- }
};
} // namespace framework
Modified: openoffice/branches/l10n/main/helpcontent2/source/text/shared/00/00000021.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/helpcontent2/source/text/shared/00/00000021.xhp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/helpcontent2/source/text/shared/00/00000021.xhp (original)
+++ openoffice/branches/l10n/main/helpcontent2/source/text/shared/00/00000021.xhp Fri Mar 15 09:24:52 2013
@@ -220,7 +220,7 @@
<paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">2011-09-29</paragraph>
</tablecell>
<tablecell>
- <paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9, Apache Open Office</paragraph>
+ <paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -231,7 +231,7 @@
<paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent" l10n="NEW">-</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2 or StarOffice 9.2</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2, StarOffice 9.2</paragraph>
</tablecell>
</tablerow>
</table>
Modified: openoffice/branches/l10n/main/helpcontent2/source/text/shared/optionen/01010500.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/helpcontent2/source/text/shared/optionen/01010500.xhp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/helpcontent2/source/text/shared/optionen/01010500.xhp (original)
+++ openoffice/branches/l10n/main/helpcontent2/source/text/shared/optionen/01010500.xhp Fri Mar 15 09:24:52 2013
@@ -79,10 +79,11 @@
<paragraph role="paragraph" id="par_id3154481" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_ADD">Adds a new color.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY" id="bm_id3150324" localize="false"/>
<paragraph role="heading" id="hd_id3153708" xml-lang="en-US" level="2" l10n="U" oldref="29">Modify</paragraph>
-<paragraph role="paragraph" id="par_id3148916" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_MODIFY">Changes the current color.</ahelp> Note that the color is overwritten without a confirmation.</paragraph>
+<paragraph role="paragraph" id="par_id3148916" xml-lang="en-US" l10n="C" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_MODIFY">Changes the current color. Note that the color is overwritten without a confirmation.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON" id="bm_id3153767" localize="false"/>
<paragraph role="heading" id="hd_id3154754" xml-lang="en-US" level="2" l10n="U" oldref="31"><link href="text/shared/optionen/01010501.xhp" name="Edit">Edit</link></paragraph>
-<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
+<paragraph role="paragraph" id="par_id3141111" xml-lang="en-US" l10n="N"><ahelp hid=".">Opens the Color Picker. First highlight a color in the Color table. Then click Edit to open the Color Picker. Select a color in the Color Picker and click OK. The selected color replaces the color that is highlighted in the Color table.</ahelp></paragraph>
+
<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD" id="bm_id3145148" localize="false"/>
<paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="2" l10n="U" oldref="33">Load Color List</paragraph>
Modified: openoffice/branches/l10n/main/helpcontent2/source/text/shared/optionen/01010501.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/helpcontent2/source/text/shared/optionen/01010501.xhp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/helpcontent2/source/text/shared/optionen/01010501.xhp (original)
+++ openoffice/branches/l10n/main/helpcontent2/source/text/shared/optionen/01010501.xhp Fri Mar 15 09:24:52 2013
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -10,100 +8,175 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
+<helpdocument version="1.0">
+ <meta>
+ <topic id="textsharedoptionen01010501xml" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Color</title>
+ <filename>/text/shared/optionen/01010501.xhp</filename>
+ </topic>
+ <history>
+ <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
+ <lastedited date="2007-02-22T15:37:30">converted from old format - fpe</lastedited>
+ </history>
+ </meta>
+ <body>
+ <!-- TITLE -->
+ <bookmark xml-lang="en-US" branch="hid/cui:ModalDialog:ColorPicker" id="bm_id5566778800" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778800" xml-lang="en-US" level="1" l10n="U">Color Picker</paragraph>
+ <bookmark xml-lang="en-US" branch="index" id="bm_id3150771">
+ <bookmark_value>defining;colors</bookmark_value>
+ <bookmark_value>colors;selection</bookmark_value>
+ <bookmark_value>colors;adding</bookmark_value>
+ </bookmark>
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textsharedoptionen01010501xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Color</title>
-<filename>/text/shared/optionen/01010501.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-22T15:37:30">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3153126" xml-lang="en-US" level="1" l10n="U" oldref="1">Color</paragraph>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150771"><bookmark_value>defining;colors</bookmark_value>
-<bookmark_value>colors;selection</bookmark_value>
-<bookmark_value>colors;adding</bookmark_value>
-</bookmark>
-<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="2"><variable id="farbentext"><ahelp hid=".">Allows you to define your own colors using the two-dimensional graphic and numerical gradient chart.</ahelp>
-</variable> Click <emph>OK</emph> to display the newly defined color in the preview box of the <emph>Colors</emph> register, where you can then decide if you want to add or replace the new color in the current color palette.<comment>UFI: make this a guide file plus ref link</comment></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#color2"/>
-</section>
-<paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="U" oldref="3">Color Window</paragraph>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="4">In the two big color windows, you click to select a new color. You can select the color in the left or the right color window as you wish.</paragraph>
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="5">In the right color window, you will see the entire color spectrum from the left to the right, with the colors at the top being fully saturated and the colors at the bottom being unsaturated.</paragraph>
-<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="6">In the left color window, you will see a selection of colors, displaying a progressive spectrum, varying between the four colors in the four corners of this window. You can change the colors in the four corners as follows:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="7">Click the corner of the field in which you want to change the color.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150398" xml-lang="en-US" l10n="U" oldref="8">In the right color window, click the desired new color for the corner field or enter the values, which define the color, in the numeric input fields.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151210" xml-lang="en-US" l10n="CHG" oldref="9">Apply the color selected on the right to the small field that is marked in the left color window by clicking the <emph><--</emph> button.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3151383" xml-lang="en-US" l10n="U" oldref="10">The gradient in the left color window is immediately adjusted with respect to hue, saturation, and brightness.</paragraph>
-<paragraph role="note" id="par_id9701528" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_COLOR:BTN_1" id="bm_id3154126" localize="false"/>
-<paragraph role="heading" id="hd_id3153192" xml-lang="en-US" level="2" l10n="U" oldref="11"><--</paragraph>
-<paragraph role="paragraph" id="par_id3154909" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_1">Click the <emph><--</emph> button to replace the selected color in the color palette with the color selected at the right. The button is enabled when you select a color in one of the four corners.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:PushButton:DLG_COLOR:BTN_2" id="bm_id3145608" localize="false"/>
-<paragraph role="heading" id="hd_id3158409" xml-lang="en-US" level="2" l10n="U" oldref="13">--></paragraph>
-<paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS:PUSHBUTTON:DLG_COLOR:BTN_2">Sets the small selection cursor in the right window on the color, which corresponds to the selected color in the left window and updates the respective values in the numerical fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_TPCOLOR_CMYK_1" id="bm_id3159152" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_CYAN" id="bm_id3153367" localize="false"/>
-<paragraph role="heading" id="hd_id3149203" xml-lang="en-US" level="2" l10n="U" oldref="15">Cyan</paragraph>
-<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_CYAN">Sets the Cyan color value in the CMYK color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_TPCOLOR_CMYK_2" id="bm_id3159155" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_MAGENTA" id="bm_id3150486" localize="false"/>
-<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="2" l10n="U" oldref="17">Magenta</paragraph>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_MAGENTA">Sets the Magenta color value in the CMYK color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_TPCOLOR_CMYK_3" id="bm_id3147443" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_YELLOW" id="bm_id3152576" localize="false"/>
-<paragraph role="heading" id="hd_id3154147" xml-lang="en-US" level="2" l10n="U" oldref="19">Yellow</paragraph>
-<paragraph role="paragraph" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_YELLOW">Sets the Yellow color value in the CMYK color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4" id="bm_id3155854" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools:MetricField:DLG_COLOR:NUM_KEY" id="bm_id3154012" localize="false"/>
-<paragraph role="heading" id="hd_id3150105" xml-lang="en-US" level="2" l10n="U" oldref="21">Key</paragraph>
-<paragraph role="paragraph" id="par_id3146148" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVTOOLS_METRICFIELD_DLG_COLOR_NUM_KEY">Sets the Black color value or key (black) in the CMYK color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_RED" id="bm_id3153573" localize="false"/>
-<paragraph role="heading" id="hd_id3151114" xml-lang="en-US" level="2" l10n="U" oldref="23">Red</paragraph>
-<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_RED">Sets the Red color value in the RGB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_GREEN" id="bm_id3149481" localize="false"/>
-<paragraph role="heading" id="hd_id3148618" xml-lang="en-US" level="2" l10n="U" oldref="25">Green</paragraph>
-<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_GREEN">Sets the Green color value in the RGB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_BLUE" id="bm_id3145799" localize="false"/>
-<paragraph role="heading" id="hd_id3151075" xml-lang="en-US" level="2" l10n="U" oldref="27">Blue</paragraph>
-<paragraph role="paragraph" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_BLUE">Sets the Blue color value in the RGB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_HUE" id="bm_id3149581" localize="false"/>
-<paragraph role="heading" id="hd_id3145647" xml-lang="en-US" level="2" l10n="U" oldref="29">Color</paragraph>
-<paragraph role="paragraph" id="par_id3154729" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_HUE">Sets the Hue in the HSB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_SATURATION" id="bm_id3153415" localize="false"/>
-<paragraph role="heading" id="hd_id3144766" xml-lang="en-US" level="2" l10n="U" oldref="31">Saturation</paragraph>
-<paragraph role="paragraph" id="par_id3153512" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_SATURATION">Sets the Saturation in the HSB color model.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:NumericField:DLG_COLOR:NUM_LUMINANCE" id="bm_id3146990" localize="false"/>
-<paragraph role="heading" id="hd_id3156180" xml-lang="en-US" level="2" l10n="U" oldref="33">Luminance</paragraph>
-<paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVTOOLS:NUMERICFIELD:DLG_COLOR:NUM_LUMINANCE">Sets the Brightness in the HSB color model.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<paragraph role="paragraph" id="par_id3154164" xml-lang="en-US" l10n="U" oldref="35">In the left preview field, you will see the original color from the parent tab, <emph>Colors</emph>. In the right preview field, you will always see the current result of your work in this dialog.</paragraph>
-</body>
+ <paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="2">
+ <variable id="farbentext">
+ <ahelp hid=".">Allows you to define your own colors.</ahelp>
+ </variable>
+ </paragraph>
+
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#color2"/>
+ </section>
+
+ <paragraph role="note" id="par_id9701528" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
+
+ <!-- 1. Color field: the big,main control -->
+ <bookmark xml-lang="en-US" branch="hid/cui:Control:ColorPicker:ColorField" id="bm_id5566778801" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778801" xml-lang="en-US" level="2" l10n="U" oldref="3">Color Field</paragraph>
+ <paragraph role="paragraph" id="par_id5566778801" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:Control:ColorPicker:ColorField">In the big color field, you click to select a new color.</ahelp>
+ </paragraph>
+
+ <!-- 2. Color slider: the control with a slider -->
+ <bookmark xml-lang="en-US" branch="hid/cui:Control:ColorPicker:ColorSlider" id="bm_id5566778802" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778802" xml-lang="en-US" level="2" l10n="U" oldref="3">Color Slider</paragraph>
+ <paragraph role="paragraph" id="par_id5566778802" xml-lang="en-US" l10n="U">Click any of the six option buttons Red, Green, Blue, Hue, Saturation, or Brightness. The color slider changes to show the available range of values. <ahelp hid="cui:Control:ColorPicker:ColorSlider">In the color slider, you will see the range of values that you can change, depending on the selected option button. Click inside the color slider to change values in the big color field.</ahelp>
+ </paragraph>
+
+ <!-- 3. The color preview - bottom, left -->
+ <bookmark xml-lang="en-US" branch="hid/cui:Control:ColorPicker:ColorPreview" id="bm_id5566778803" localize="false"/>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
+ <paragraph role="heading" id="hd_id5566778803" xml-lang="en-US" level="2" l10n="U" oldref="3">Current Color Preview</paragraph>
+ <paragraph role="paragraph" id="par_id5566778803" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:Control:ColorPicker:ColorPreview">In the left half of the preview field, you will always see the current result of your work in this dialog.</ahelp>
+ </paragraph>
+
+ <!-- 4. Previous color - bottom, right -->
+ <bookmark xml-lang="en-US" branch="hid/cui:Control:ColorPicker:ColorPrevious" id="bm_id5566778803b" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778803b" xml-lang="en-US" level="2" l10n="U" oldref="3">Previous Color</paragraph>
+ <paragraph role="paragraph" id="par_id5566778803b" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:Control:ColorPicker:ColorPrevious">In the right half of the preview field, you will see the original color from the parent tab, <emph>Colors</emph>.</ahelp>
+ </paragraph>
+
+ <!--5. RGB -->
+ <paragraph role="heading" id="hd_id5566778804" xml-lang="en-US" level="2" l10n="U" oldref="3">RGB</paragraph>
+ <paragraph role="paragraph" id="par_id5566778804" xml-lang="en-US" l10n="U">These set of controls allow to choose a color in the RGB color model, where red, green, and blue are combined to produce a color.</paragraph>
+
+ <!-- 5.1. Red -->
+ <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:ColorPicker:Red" id="bm_id5566778804" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Red" id="bm_id5566778805" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778805" xml-lang="en-US" level="3" l10n="U" oldref="3">Red</paragraph>
+ <paragraph role="paragraph" id="par_id5566778805" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:MetricField:ColorPicker:Red">Sets the Red color value in the RGB color model.</ahelp>
+ </paragraph>
+
+ <!-- 5.2. Green -->
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Green" id="bm_id5566778806" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:ColorPicker:Green" id="bm_id5566778807" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778806" xml-lang="en-US" level="3" l10n="U" oldref="3">Green</paragraph>
+ <paragraph role="paragraph" id="par_id5566778806" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:RadioButton:ColorPicker:Green">Sets the Green color value in the RGB color model.</ahelp>
+ </paragraph>
+
+ <!-- 5.3. Blue -->
+ <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:ColorPicker:Blue" id="bm_id5566778808" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Blue" id="bm_id5566778809" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778807" xml-lang="en-US" level="3" l10n="U" oldref="3">Blue</paragraph>
+ <paragraph role="paragraph" id="par_id5566778807" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:MetricField:ColorPicker:Blue">Sets the Blue color value in the RGB color model.</ahelp>
+ </paragraph>
+
+ <!-- 5.4. Hex -->
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Hex" id="bm_id5566778810" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778808" xml-lang="en-US" level="3" l10n="U" oldref="3">Hex</paragraph>
+ <paragraph role="paragraph" id="par_id5566778808" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:MetricField:ColorPicker:Hex">Sets the Red, Green, and Blue color value in the RGB color model, using a hexadecimal format RRGGBB.</ahelp>
+ </paragraph>
+
+ <!--6. HSB -->
+ <paragraph role="heading" id="hd_id5566778809" xml-lang="en-US" level="2" l10n="U" oldref="3">HSB</paragraph>
+ <paragraph role="paragraph" id="par_id5566778809" xml-lang="en-US" l10n="U">These set of controls allow to choose a color in the HSB color space.</paragraph>
+
+ <!-- 6.1. Hue -->
+ <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:ColorPicker:Hue" id="bm_id5566778811" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Hue" id="bm_id5566778811" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778810" xml-lang="en-US" level="3" l10n="U" oldref="3">Hue</paragraph>
+ <paragraph role="paragraph" id="par_id5566778810" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:MetricField:ColorPicker:Hue">Sets the Hue in the HSB color model.</ahelp>
+ </paragraph>
+
+ <!-- 6.2. Saturation -->
+ <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:ColorPicker:Saturation" id="bm_id5566778812" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Saturation" id="bm_id5566778812" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778811" xml-lang="en-US" level="3" l10n="U" oldref="3">Saturation</paragraph>
+ <paragraph role="paragraph" id="par_id5566778811" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:MetricField:ColorPicker:Saturation">Sets the Saturation in the HSB color model.</ahelp>
+ </paragraph>
+
+ <!-- 6.3. Brightness -->
+ <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:ColorPicker:Brightness" id="bm_id5566778813" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Brightness" id="bm_id5566778813" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778812" xml-lang="en-US" level="3" l10n="U" oldref="3">Brightness</paragraph>
+ <paragraph role="paragraph" id="par_id5566778812" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:MetricField:ColorPicker:Brightness">Sets the Brightness in the HSB color model.</ahelp>
+ </paragraph>
+
+ <!--7. CMYK -->
+ <paragraph role="heading" id="hd_id5566778813" xml-lang="en-US" level="2" l10n="U" oldref="3">CMYK</paragraph>
+ <paragraph role="paragraph" id="par_id5566778813" xml-lang="en-US" l10n="U">These set of controls allow to choose a color in the CMYK color model. CMYK refers to the four inks used in some color printing: cyan, magenta, yellow, and key (black).</paragraph>
+
+ <!-- 7.1. Cyan -->
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Cyan" id="bm_id5566778814" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778814" xml-lang="en-US" level="3" l10n="U" oldref="3">Cyan</paragraph>
+ <paragraph role="paragraph" id="par_id5566778814" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:MetricField:ColorPicker:Cyan">Sets the Cyan color value in the CMYK color model.</ahelp>
+ </paragraph>
+
+ <!-- 7.2. Magenta -->
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Magenta" id="bm_id5566778815" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778815" xml-lang="en-US" level="3" l10n="U" oldref="3">Magenta</paragraph>
+ <paragraph role="paragraph" id="par_id5566778815" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:MetricField:ColorPicker:Magenta">Sets the Magenta color value in the CMYK color model.</ahelp>
+ </paragraph>
+
+ <!-- 7.3. Yellow -->
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Yellow" id="bm_id5566778816" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778816" xml-lang="en-US" level="3" l10n="U" oldref="3">Yellow</paragraph>
+ <paragraph role="paragraph" id="par_id5566778816" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:MetricField:ColorPicker:Yellow">Sets the Yellow color value in the CMYK color model.</ahelp>
+ </paragraph>
+
+ <!-- 7.4. Key -->
+ <bookmark xml-lang="en-US" branch="hid/cui:MetricField:ColorPicker:Key" id="bm_id5566778817" localize="false"/>
+ <paragraph role="heading" id="hd_id5566778817" xml-lang="en-US" level="3" l10n="U" oldref="3">Key</paragraph>
+ <paragraph role="paragraph" id="par_id5566778817" xml-lang="en-US" l10n="U">
+ <ahelp hid="cui:MetricField:ColorPicker:Key">Sets the Black color value or key (black) in the CMYK color model.</ahelp>
+ </paragraph>
+
+ <!-- TODO HelpButton BTN_HELP OKButton BTN_OK CancelButton BTN_CANCEL -->
+
+ </body>
</helpdocument>
Modified: openoffice/branches/l10n/main/hwpfilter/source/drawdef.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/drawdef.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/drawdef.h (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/drawdef.h Fri Mar 15 09:24:52 2013
@@ -137,9 +137,9 @@ struct RotationProperty
*/
struct HWPDOProperty
{
- int line_pstyle; /* ¼± Áß°£ ¸ð¾ç */
- int line_hstyle; /* ³¡ È»ìÇ¥ ¸ð¾ç */
- int line_tstyle; /* ½ÃÀÛ ¸ð¾ç */
+ int line_pstyle; /* ì ì¤ê° 모ì */
+ int line_hstyle; /* ë íì´í 모ì */
+ int line_tstyle; /* ìì 모ì */
DWORD line_color;
hunit line_width;
DWORD fill_color;
Modified: openoffice/branches/l10n/main/hwpfilter/source/drawing.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/drawing.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/drawing.h (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/drawing.h Fri Mar 15 09:24:52 2013
@@ -191,8 +191,8 @@ static bool SkipUnusedField(void)
#define HDOFILE_HAS_CHILD 0x02
/**
- * °øÅë Çì´õ¸¦ Àоîµå¸°´Ù.
- * °³Ã¼Á¾·ù/¿¬°áÁ¤º¸/»ó´ëÀ§Ä¡/°³Ã¼Å©±â/Àý´ëÀ§Ä¡/Â÷Áö¿µ¿ª/±âº»¼Ó¼º/ȸÀü¼Ó¼º/±×¶óµ¥À̼Ç/ºñÆ®¸ÊÆÐÅÏ
+ * ê³µíµ í¤ë를 ì½ì´ë린ë¤.
+ * ê°ì²´ì¢
ë¥/ì°ê²°ì ë³´/ìëìì¹/ê°ì²´í¬ê¸°/ì ëìì¹/ì°¨ì§ìì/기본ìì±/íì ìì±/ê·¸ë¼ë°ì´ì
/ë¹í¸ë§µí¨í´
*/
static bool LoadCommonHeader(HWPDrawingObject * hdo, WORD * link_info)
{
@@ -785,7 +785,7 @@ int cmd, void *argp, int argv)
}
-/* HWPDrawObject ¸â¹ö ÇÔ¼ö */
+/* HWPDrawObject ë©¤ë² í¨ì */
HWPDrawingObject::HWPDrawingObject()
{
Modified: openoffice/branches/l10n/main/hwpfilter/source/formula.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/formula.cpp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/formula.cpp (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/formula.cpp Fri Mar 15 09:24:52 2013
@@ -390,7 +390,7 @@ void Formula::makeDecoration(Node *res)
else
fprintf(stderr,"<math:munder>\n");
#else
- /* accent´Â ¾ðÁ¦ trueÀÌ°í, ¾ðÁ¦, falseÀÎÁö ¸ð¸£°Ú´Ù. */
+ /* accentë ì¸ì trueì´ê³ , ì¸ì , falseì¸ì§ ëª¨ë¥´ê² ë¤. */
if( isover ){
padd(ascii("accent"),ascii("CDATA"),ascii("true"));
rstartEl(ascii("math:mover"), rList);
Modified: openoffice/branches/l10n/main/hwpfilter/source/hbox.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hbox.cpp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hbox.cpp (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hbox.cpp Fri Mar 15 09:24:52 2013
@@ -404,7 +404,7 @@ Footnote::~Footnote(void)
// auto number(18)
// new number(19)
// show page number (20)
-// Ȧ¼öÂʽÃÀÛ/°¨Ãß±â (21)
+// íì쪽ìì/ê°ì¶ê¸° (21)
// mail merge(22)
hchar_string MailMerge::GetString()
@@ -425,7 +425,7 @@ hchar_string MailMerge::GetString()
static hchar olHanglJaso(int num, int type)
{
static unsigned char han_init[] =
- { "\x88\x90\x94\x9c\xa0\xa4\xac\xb4\xb8\xc0\xc4\xc8\xcc\xd0" };
+ "\x88\x90\x94\x9c\xa0\xa4\xac\xb4\xb8\xc0\xc4\xc8\xcc\xd0";
static unsigned char jung[] = { 3, 5, 7, 11, 13, 19, 20, 26, 27, 29, 30 };
static unsigned char jung2[] = { 3, 7, 13, 20, 27, 29, 30 };
@@ -551,9 +551,9 @@ static void getOutlineNumStr(int style,
enum
{ OUTLINE_ON, OUTLINE_NUM };
-/* level Àº 0ºÎÅÍ ½ÃÀÛ. Áï 1.1.1. ÀÇ ·¹º§Àº 2ÀÌ´Ù.
- number´Â °ªÀÌ ±×´ë·Î µé¾î°¡ ÀÖ´Ù. Áï, 1.2.1¿¡´Â 1,2,1ÀÌ µé¾î°¡ ÀÖ´Ù.
- style Àº 1ºÎÅÍ °ªÀÌ µé¾î°¡ ÀÖ´Ù. hbox.h¿¡ Á¤ÀÇµÈ µ¥·Î..
+/* level ì 0ë¶í° ìì. ì¦ 1.1.1. ì ë 벨ì 2ì´ë¤.
+ numberë ê°ì´ ê·¸ëë¡ ë¤ì´ê° ìë¤. ì¦, 1.2.1ìë 1,2,1ì´ ë¤ì´ê° ìë¤.
+ style ì 1ë¶í° ê°ì´ ë¤ì´ê° ìë¤. hbox.hì ì ìë ë°ë¡..
*/
hchar_string Outline::GetUnicode() const
{
@@ -612,17 +612,17 @@ hchar_string Outline::GetUnicode() const
if( deco[i][0] ){
buffer[l++] = deco[i][0];
}
-/* level Àº 0ºÎÅÍ ½ÃÀÛ. Áï 1.1.1. ÀÇ ·¹º§Àº 2ÀÌ´Ù.
- number´Â °ªÀÌ ±×´ë·Î µé¾î°¡ ÀÖ´Ù. Áï, 1.2.1¿¡´Â 1,2,1ÀÌ µé¾î°¡ ÀÖ´Ù.
- style Àº 1ºÎÅÍ °ªÀÌ µé¾î°¡ ÀÖ´Ù. hbox.h¿¡ Á¤ÀÇµÈ µ¥·Î..
+/* level ì 0ë¶í° ìì. ì¦ 1.1.1. ì ë 벨ì 2ì´ë¤.
+ numberë ê°ì´ ê·¸ëë¡ ë¤ì´ê° ìë¤. ì¦, 1.2.1ìë 1,2,1ì´ ë¤ì´ê° ìë¤.
+ style ì 1ë¶í° ê°ì´ ë¤ì´ê° ìë¤. hbox.hì ì ìë ë°ë¡..
*/
switch( user_shape[i] )
{
case 0:
buffer[l++] = '1' + number[i] - 1;
break;
- case 1: /* ´ë¹®Àڷθ¶ */
- case 2: /* ¼Ò¹®Àڷθ¶ */
+ case 1: /* ë문ìë¡ë§ */
+ case 2: /* ì문ìë¡ë§ */
num2roman(number[i], dest);
if( user_shape[i] == 1 ){
char *ptr = dest;
@@ -647,22 +647,22 @@ hchar_string Outline::GetUnicode() const
case 6:
buffer[l++] = olHanglJaso(number[i] -1, OL_HANGL_JASO);
break;
- case 7: /* ÇÑÀÚ ¼ýÀÚ : ÀÏ¹Ý ¼ýÀڷΠǥÇö */
+ case 7: /* íì ì«ì : ì¼ë° ì«ìë¡ íí */
buffer[l++] = '1' + number[i] -1;
break;
- case 8: /* ¿ø¼ýÀÚ */
+ case 8: /* ìì«ì */
buffer[l++] = 0x2e00 + number[i];
break;
- case 9: /* ¿ø ¾ËÆĺª ¼Ò¹®ÀÚ */
+ case 9: /* ì ìíë²³ ì문ì */
buffer[l++] = 0x2c20 + number[i];
break;
- case 10: /* ¿ø °¡³ª´Ù */
+ case 10: /* ì ê°ëë¤ */
buffer[l++] = 0x2c50 + number[i] -1;
break;
- case 11: /* ¿ø ¤¡ ¤¤ */
+ case 11: /* ì ã± ã´ */
buffer[l++] = 0x2c40 + number[i] -1;
break;
- case 12: /* À̾îÁø ¼ýÀÚ. */
+ case 12: /* ì´ì´ì§ ì«ì. */
{
char cur_num_str[10],buf[80];
int j;
@@ -696,6 +696,6 @@ hchar_string Outline::GetUnicode() const
}
-/* ¹À½ ºóÄ(30) */
-/* °íÁ¤Æø ºóÄ(31) */
+/* 묶ì ë¹ì¹¸(30) */
+/* ê³ ì í ë¹ì¹¸(31) */
Modified: openoffice/branches/l10n/main/hwpfilter/source/hbox.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hbox.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hbox.h (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hbox.h Fri Mar 15 09:24:52 2013
@@ -88,9 +88,9 @@ struct SkipBlock: public HBox
struct DateCode;
struct FieldCode : public HBox
{
- uchar type[2]; /* 2/0 - °è»ê½Ä, 3/0-¹®¼¿ä¾à, 3/1-°³ÀÎÁ¤º¸, 3/2-¸¸µç³¯Â¥, 4/0-´©¸§Æ² */
+ uchar type[2]; /* 2/0 - ê³ì°ì, 3/0-문ììì½, 3/1-ê°ì¸ì ë³´, 3/2-ë§ë ë ì§, 4/0-ëë¦í */
char *reserved1;
- unsigned short location_info; /* 0 - ³¡ÄÚµå, 1 - ½ÃÀÛÄÚµå */
+ unsigned short location_info; /* 0 - ëì½ë, 1 - ììì½ë */
char *reserved2;
hchar *str1;
hchar *str2;
@@ -215,7 +215,7 @@ enum
struct CellLine
{
unsigned char key;
- unsigned char top; // 0 - ¶óÀξøÀ½, 1-single, 2-thick, 3-double
+ unsigned char top; // 0 - ë¼ì¸ìì, 1-single, 2-thick, 3-double
unsigned char bottom;
unsigned char left;
unsigned char right;
@@ -263,7 +263,7 @@ struct FBoxStyle
/**
* Kind of wrap
*/
- unsigned char txtflow; /* ±×¸²ÇÇÇÔ. 0-2(ÀÚ¸®Â÷Áö,Åõ¸í,¾î¿ï¸²) */
+ unsigned char txtflow; /* 그림í¼í¨. 0-2(ì리차ì§,í¬ëª
,ì´ì¸ë¦¼) */
/**
* Horizontal alignment
*/
@@ -281,12 +281,12 @@ struct FBoxStyle
/**
* Index of floating object
*/
- short boxnum; /* ½ºÅ¸¿ÀÇǽº¿¡¼ ½ºÅ¸ÀÏ À̸§À¸·Î »ç¿ëµÉ ¼ýÀÚ */
+ short boxnum; /* ì¤íì¤í¼ì¤ìì ì¤íì¼ ì´ë¦ì¼ë¡ ì¬ì©ë ì«ì */
/**
* Type of floating object : line, txtbox, image, table, equalizer and button
*/
unsigned char boxtype; // (L)ine, t(X)tbox, Picture - (G)
- short cap_len; /* ĸ¼ÇÀÇ ±æÀÌ */
+ short cap_len; /* 캡ì
ì ê¸¸ì´ */
void *cell;
@@ -312,8 +312,8 @@ struct FBox: public HBox
char xpos_type, ypos_type;
unsigned char smart_linesp;
-/* ÀÌ ÀÚ·á´Â tbox³ª pic¿¡¼´Â ÆÄÀÏ¿¡ ±â·ÏÇÏÁö ¾Ê°í ½ÇÇà½Ã¸¸ ÀÖÀ¸¸ç,
- line¿¡¼´Â ÆÄÀÏ¿¡ ±â·ÏÇÑ´Ù.
+/* ì´ ìë£ë tboxë picììë íì¼ì 기ë¡íì§ ìê³ ì¤íìë§ ìì¼ë©°,
+ lineììë íì¼ì 기ë¡íë¤.
*/
short boundsy, boundey;
unsigned char boundx, draw;
@@ -357,7 +357,7 @@ struct TxtBox: public FBox
* The value of type indicates as the below: zero is table, one is
* textbox, two is equalizer and three is button.
*/
- short type; // 0-table, 1-textbox, 2-¼ö½Ä, 3-button
+ short type; // 0-table, 1-textbox, 2-ìì, 3-button
/**
* nCell is greater than one only for table, otherwise it is 1.
*/
@@ -545,7 +545,7 @@ struct Table
TxtBox *box;
};
-/* picture (11) ±×¸², OLE±×¸², »ðÀԱ׸², ±×¸®±â */
+/* picture (11) 그림, OLE그림, ì½ì
그림, 그리기 */
enum pictype
{
PICTYPE_FILE, PICTYPE_OLE, PICTYPE_EMBED,
@@ -624,7 +624,7 @@ struct Picture: public FBox
* follow_block_size is the size information of the Drawing object of hwp.
* It's value is greater than 0 if the pictype is PICTYPE_DRAW.
*/
- ulong follow_block_size; /* Ãß°¡Á¤º¸ ±æÀÌ. */
+ ulong follow_block_size; /* ì¶ê°ì ë³´ 길ì´. */
short dummy1; // to not change structure size */
short dummy2; // to not change structure size */
uchar reserved1;
@@ -654,7 +654,7 @@ struct Picture: public FBox
/**
* It's for the Drawing object
*/
- unsigned char *follow; /* ±×¸²Á¾·ù°¡ drawingÀ϶§, Ãß°¡Á¤º¸. */
+ unsigned char *follow; /* 그림ì¢
ë¥ê° drawingì¼ë, ì¶ê°ì ë³´. */
bool ishyper;
@@ -830,7 +830,7 @@ struct ShowPageNum: public HBox
virtual int Read(HWPFile &hwpf);
};
-/* Ȧ¼öÂʽÃÀÛ (21) */
+/* íì쪽ìì (21) */
#define HIDE_HD 1 /* bit 0 */
#define HIDE_FT 2 /* bit 1 */
#define HIDE_PGNUM 4 /* bit 2 */
@@ -1000,7 +1000,7 @@ class Outline: public HBox
/**
* decoration charactor for the level type
*/
- hchar deco[MAX_OUTLINE_LEVEL][2]; /* »ç¿ëÀÚ Á¤Àǽà ¾ÕµÚ ¹®ÀÚ */
+ hchar deco[MAX_OUTLINE_LEVEL][2]; /* ì¬ì©ì ì ìì ìë¤ ë¬¸ì */
hchar dummy;
Outline();
@@ -1009,7 +1009,7 @@ class Outline: public HBox
hchar_string GetUnicode() const;
};
-/* ¹À½ ºóÄ(30) */
+/* 묶ì ë¹ì¹¸(30) */
/**
* The Special space to be treated non-space when a string is
* cut at the end of line
@@ -1024,7 +1024,7 @@ struct KeepSpace: public HBox
virtual int Read(HWPFile &hwpf);
};
-/* °íÁ¤Æø ºóÄ(31) */
+/* ê³ ì í ë¹ì¹¸(31) */
/**
* @short Space with always same width not relation with fonts.
*/
Modified: openoffice/branches/l10n/main/hwpfilter/source/hcode.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hcode.cpp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hcode.cpp (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hcode.cpp Fri Mar 15 09:24:52 2013
@@ -552,7 +552,7 @@ static hchar cdkssm2ks_han(hchar kssm)
unsigned int index;
unsigned char lo, hi;
-/* "ÇÑ" */
+/* "í" */
if (kssm == 0xd3c5)
return 0xc7d1;
@@ -615,7 +615,7 @@ static hchar choseong_to_unicode[] =
0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1120, 0x1121, 0x1127,
0x112b, 0x112d, 0x112f, 0x1132, 0x1136, 0x1140, 0x114c, 0x1158
};
-/* Áß¼ºÀÌ 0°ú 1ÀÎ °÷¿¡´Â ´Ù¸¥ ÄÚµåµéÀÌ µé¾î°¡ ÀÖ´Ù. À̺κп¡ ´ëÇÑ ¹ýÄ¢À» »Ì¾Æ¶ó. */
+/* ì¤ì±ì´ 0ê³¼ 1ì¸ ê³³ìë ë¤ë¥¸ ì½ëë¤ì´ ë¤ì´ê° ìë¤. ì´ë¶ë¶ì ëí ë²ì¹ì ë½ìë¼. */
static hchar joongseong_to_unicode[] =
{
0, 0, 0, 0x1161, 0x1162, 0x1163, 0x1164, 0x1165,
@@ -632,12 +632,12 @@ static hchar jongseong_to_unicode[] =
0x11bd, 0x11be, 0x11bf, 0x11c0, 0x11c1, 0x11c2, 0x11eb, 0x11f0
};
-/* Áß¼ºÀÌ 0°ú 1Àΰ÷ */
-/* óÀ½ 32°³´Â ÀÚ¸ð, ³ª¸ÓÁö 32°³´Â Á¶ÇÕÀ¸·Î ±¸¼º.
- * 0x8000 ~ 0xa413±îÁö 32°³ ³ª¿À°í, 0x0400´õÇÑ 0x8400¿¡¼ ´Ù½Ã 32°³ ³ª¿À´Â ½ÄÀ¸·Î ÁøÇàµÈ´Ù.
- * Àڸ𿵿ªÀº ÀÏ¹Ý Å×À̺í·Î ³ª¸ÓÁö´Â ±¸Á¶Ã¼ ¸ÅÇÎÅ×À̺í·Î ¸¸µç´Ù.
+/* ì¤ì±ì´ 0ê³¼ 1ì¸ê³³ */
+/* ì²ì 32ê°ë ì모, ëë¨¸ì§ 32ê°ë ì¡°í©ì¼ë¡ 구ì±.
+ * 0x8000 ~ 0xa413ê¹ì§ 32ê° ëì¤ê³ , 0x0400ëí 0x8400ìì ë¤ì 32ê° ëì¤ë ìì¼ë¡ ì§íëë¤.
+ * ì모ììì ì¼ë° í
ì´ë¸ë¡ ë머ì§ë 구조체 매íí
ì´ë¸ë¡ ë§ë ë¤.
*/
-/* 308°³.. 1152°³¿¡¼ 308°³¸¦ Á¦¿ÜÇÑ ³ª¸ÓÁö 844°³´Â ÀÚ¸ðÁ¶ÇÕÀÌ´Ù. */
+/* 308ê°.. 1152ê°ìì 308ê°ë¥¼ ì ì¸í ëë¨¸ì§ 844ê°ë ì모조í©ì´ë¤. */
static hchar jamo_to_unicode[] =
{
0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3138,
@@ -696,7 +696,7 @@ struct JamoComp{
hchar v2;
hchar v3;
};
-/* 704 + 12 = 706 °³ */
+/* 704 + 12 = 706 ê° */
static JamoComp jamocomp1_to_unicode[] =
{
{3, 0x1100, 0x1161, 0x11e7}, {3, 0x1100, 0x1161, 0x3167},
@@ -819,7 +819,7 @@ static JamoComp jamocomp1_to_unicode[] =
{3, 0x1105, 0x119e, 0x11d7}, {3, 0x1105, 0x119e, 0x11dc},
{3, 0x1105, 0x119e, 0x11dd}, {2, 0x1105, 0x1176, 0x0000},
-/* -- ¿©±âºÎÅÍ ¼ýÀÚ ¾È¹Ù²Þ Áï, 3À» 2·Î ¹Ù²Ù¾î ÁÖ¾î¾ß ÇÔ. */
+/* -- ì¬ê¸°ë¶í° ì«ì ìë°ê¿ ì¦, 3ì 2ë¡ ë°ê¾¸ì´ 주ì´ì¼ í¨. */
{2, 0x1105, 0x1178, 0x0000}, {2, 0x1105, 0x117a, 0x0000},
{2, 0x1105, 0x117b, 0x0000}, {2, 0x1105, 0x1186, 0x0000},
{2, 0x1105, 0x1187, 0x0000}, {2, 0x1105, 0x118c, 0x0000},
@@ -946,11 +946,11 @@ int hcharconv(hchar ch, hchar *dest, int
dest[0] = ch;
return 1;
}
- /* ÇÑÀÚ´Â 0x4000ºÎÅÍ 4888°¡ÁöÀÇ °ªÀ» °¡Áø´Ù. */
+ /* íìë 0x4000ë¶í° 4888ê°ì§ì ê°ì ê°ì§ë¤. */
else if (IsHanja(ch))
{
- /* 4888ÀÌ¿ÜÀÇ ¼ö´Â ¾Æ·¡Çѱۿ¡¼ Á¤ÀÇÇÑ È®ÀåÇÑÀÚÀÌ´Ù. ÀÌ°Í¿¡ ´ëÇؼ´Â
- À¯´ÏÄڵ峪 ¿Ï¼ºÇüÄÚµå·ÎÀÇ º¯È¯À» À§ÇÑ ¸ÅÇÎÅ×À̺í¾î ¾ø´Â ½ÇÁ¤ÀÌ´Ù.
+ /* 4888ì´ì¸ì ìë ìëíê¸ìì ì ìí íì¥íìì´ë¤. ì´ê²ì ëí´ìë
+ ì ëì½ëë ìì±íì½ëë¡ì ë³íì ìí 매íí
ì´ë¸ì´ ìë ì¤ì ì´ë¤.
*/
if ((index = ch - 0x4000) >= 4888)
{
@@ -962,8 +962,8 @@ int hcharconv(hchar ch, hchar *dest, int
}
if (codeType == KS)
{
- /* ÇÑÀÚÄÚµå´Â »óÀ§ÄÚµå¿Í ÇÏÀ§ÄÚµå·Î ³ª´©¾îÁö¸ç ÇÏÀ§ÄÚµå´Â 0xA1 - 0xFE ±îÁöÀÇ °ªÀ» °¡Áø´Ù.
- Áï ÇÏÀ§Äڵ忡 ¿Ã¼öÀÖ´Â °¡Áö¼ö´Â 0xFE - 0xA1 +1 °¡Áö¼öÀÌ´Ù.
+ /* íìì½ëë ììì½ëì íìì½ëë¡ ëëì´ì§ë©° íìì½ëë 0xA1 - 0xFE ê¹ì§ì ê°ì ê°ì§ë¤.
+ ì¦ íìì½ëì ì¬ììë ê°ì§ìë 0xFE - 0xA1 +1 ê°ì§ìì´ë¤.
*/
hi = sal::static_int_cast<unsigned char>(index / (0xFE - 0xA1 + 1) + 0xCA);
lo = sal::static_int_cast<unsigned char>(index % (0xFE - 0xA1 + 1) + 0xA1);
@@ -1027,8 +1027,8 @@ int hcharconv(hchar ch, hchar *dest, int
return 1 ;
}
/**
- * Ư¼ö¹®ÀÚ ÄÚµå
- * ¾Æ·¡Çѱۿ¡¼´Â 0x3400ºÎÅÍ Æ¯¼ö¹®ÀÚ°¡ ½ÃÀ۵ȴÙ. Á¶ÇÕÇüÀº 0xA1A0
+ * í¹ì문ì ì½ë
+ * ìëíê¸ììë 0x3400ë¶í° í¹ì문ìê° ììëë¤. ì¡°í©íì 0xA1A0
*/
else
{
@@ -1043,7 +1043,7 @@ int hcharconv(hchar ch, hchar *dest, int
dest[0] = ch;
return 1;
}
- /* Çѱ۰úÄÄÇ»ÅÍ : 0x37c0 ~ 0x37c5 */
+ /* íê¸ê³¼ì»´í¨í° : 0x37c0 ~ 0x37c5 */
if( ch2 >= 0x37c0 && ch2 <= 0x37c5 ){
if( ch2 == 0x37c0 ) dest[0] = 0xd55c;
else if( ch2 == 0x37c1 ) dest[0] = 0xae00;
@@ -1089,7 +1089,7 @@ int hcharconv(hchar ch, hchar *dest, int
}
}
-/* ÇѱÛÀÏ °æ¿ì. */
+/* íê¸ì¼ ê²½ì°. */
int kssm_hangul_to_ucs2(hchar ch, hchar *dest)
{
hchar choseong, joongseong, jongseong;
@@ -1100,13 +1100,13 @@ int kssm_hangul_to_ucs2(hchar ch, hchar
//printf("kssm_hangul_to_ucs2 : [%d,%d,%d]\n", choseong,joongseong,jongseong);
- if( joongseong < 2 ){ /* Á¶ÇÕµÇÁö ¾ÊÀº ¿µ¿ª Áß¼º=0,1 */
- if( joongseong == 0 && ch < 0xa414 ){ /* °í¾îÆ÷ÇÔ ÀÚ¸ð */
+ if( joongseong < 2 ){ /* ì¡°í©ëì§ ìì ìì ì¤ì±=0,1 */
+ if( joongseong == 0 && ch < 0xa414 ){ /* ê³ ì´í¬í¨ ì모 */
int index = choseong * 32 + jongseong;
dest[0] = jamo_to_unicode[index];
return 1;
}
- else{ /* °í¾îÆ÷ÇÔ ÀÚ¸ðÁ¶ÇÕ : Å×ÀÌºí ¹Ì¿Ï¼º */
+ else{ /* ê³ ì´í¬í¨ ìëª¨ì¡°í© : í
ì´ë¸ 미ìì± */
unsigned int index = choseong * 32 + jongseong - 308;
if( index < sizeof(jamocomp1_to_unicode)/sizeof(jamocomp1_to_unicode[0])){
dest[0] = jamocomp1_to_unicode[index].v1;
@@ -1118,11 +1118,11 @@ int kssm_hangul_to_ucs2(hchar ch, hchar
return 1;
}
}
- else if ( choseong == 1 && jongseong == 1 ){ /* ¸ðÀ½ */
+ else if ( choseong == 1 && jongseong == 1 ){ /* 모ì */
dest[0] = joongseong_to_unicode[joongseong];
return 1;
}
- else if ( joongseong == 2 && jongseong == 1 ){ /* ÀÚÀ½ */
+ else if ( joongseong == 2 && jongseong == 1 ){ /* ìì */
dest[0] = choseong_to_unicode[choseong];
return 1;
}
@@ -1131,8 +1131,8 @@ int kssm_hangul_to_ucs2(hchar ch, hchar
joongseong == 25 || joongseong > 29 ||
jongseong == 0 || jongseong == 18 ||
jongseong > 29 ||
- choseong == 1 || joongseong == 2 /* ¿Ï¼ºµÇÁö ¾ÊÀº ÇÑ±Û */
- ) { /* °í¾î */
+ choseong == 1 || joongseong == 2 /* ìì±ëì§ ìì íê¸ */
+ ) { /* ê³ ì´ */
int count = 0;
if( choseong != 1 ){
dest[count] = choseong_to_unicode[choseong];
@@ -1212,7 +1212,7 @@ hchar_string hstr2ucsstr(hchar const* hs
}
/**
- * ÇÑÄĽºÆ®¸µÀ» ¿Ï¼ºÇü½ºÆ®¸µÀ¸·Î º¯È¯ÇÑ´Ù
+ * íì»´ì¤í¸ë§ì ìì±íì¤í¸ë§ì¼ë¡ ë³ííë¤
*/
::std::string hstr2ksstr(hchar const* hstr)
{
@@ -1242,8 +1242,8 @@ hchar_string hstr2ucsstr(hchar const* hs
/*
- * Çѱۿ¡¼ ¿µ¹®¿ÜÀÇ ¹®ÀÚ±îÁö Æ÷ÇÔÇÒ ¼ö ÀÖ´Â kcharŸÀÔÀÇ ¹®ÀÚ¿À»
- * Çѱۿ¡¼ »ç¿ëÇÏ´Â hcharŸÀÔÀÇ ¹®ÀÚ¿·Î º¯È¯ÇÑ´Ù.
+ * íê¸ìì ì문ì¸ì 문ìê¹ì§ í¬í¨í ì ìë kcharíì
ì 문ìì´ì
+ * íê¸ìì ì¬ì©íë hcharíì
ì 문ìì´ë¡ ë³ííë¤.
*/
hchar_string kstr2hstr(unsigned char const* src)
{
@@ -1274,7 +1274,7 @@ char* Int2Str(int value, const char *for
}
-/* colorÀ妽º °ª°ú À½¿µ°ªÀ» Á¶ÇÕÇÏ¿© ½ºÅ¸¿ÀÇǽºÀÇ color·Î º¯È¯ */
+/* colorì¸ë±ì¤ ê°ê³¼ ììê°ì ì¡°í©íì¬ ì¤íì¤í¼ì¤ì colorë¡ ë³í */
char *hcolor2str(uchar color, uchar shade, char *buf, bool bIsChar)
{
unsigned short red,green,blue;
@@ -1478,11 +1478,11 @@ double calcAngle(int x1, int y1, int x2,
}
double angle;
angle = (180 / PI) * atan( ( y2 - y1 ) * 1.0 / ( x2 - x1 ));
- if( y2 >= y1 ){ /* 1,2»çºÐ¸é */
+ if( y2 >= y1 ){ /* 1,2ì¬ë¶ë©´ */
if( angle < 0. )
angle += 180.;
}
- else{ /* 3, 4 »çºÐ¸é */
+ else{ /* 3, 4 ì¬ë¶ë©´ */
if( angle > 0 )
angle += 180.;
else
Modified: openoffice/branches/l10n/main/hwpfilter/source/hcode.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hcode.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hcode.h (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hcode.h Fri Mar 15 09:24:52 2013
@@ -43,22 +43,22 @@ DLLEXPORT hchar ksc5601_han_to_ucs2 (hch
DLLEXPORT hchar ksc5601_sym_to_ucs2 (hchar);
DLLEXPORT hchar_string hstr2ucsstr(hchar const* hstr);
/**
- * ÇÑÄĽºÆ®¸µÀ» ¿Ï¼ºÇü½ºÆ®¸µÀ¸·Î º¯È¯ÇÑ´Ù.
+ * íì»´ì¤í¸ë§ì ìì±íì¤í¸ë§ì¼ë¡ ë³ííë¤.
*/
DLLEXPORT ::std::string hstr2ksstr(hchar const* hstr);
/**
- * ÇѱÛÀ» Æ÷ÇÔÇÒ ¼ö ÀÖ´Â charÇü½ºÆ®¸µÀ» ÇÑÄĽºÆ®¸µÀ¸·Î º¯È¯ÇÑ´Ù.
+ * íê¸ì í¬í¨í ì ìë charíì¤í¸ë§ì íì»´ì¤í¸ë§ì¼ë¡ ë³ííë¤.
*/
DLLEXPORT hchar_string kstr2hstr(uchar const* src);
/**
- * hwpÀÇ °æ·Î¸¦ unixÇüÅ·Π¹Ù²Û´Ù.
+ * hwpì ê²½ë¡ë¥¼ unixííë¡ ë°ê¾¼ë¤.
*/
DLLEXPORT ::std::string urltounix(const char *src);
/**
- * hwpÀÇ °æ·Î¸¦ windowsÇüÅ·Π¹Ù²Û´Ù.
+ * hwpì ê²½ë¡ë¥¼ windowsííë¡ ë°ê¾¼ë¤.
*/
#ifdef _WIN32
DLLEXPORT ::std::string urltowin(const char *src);
@@ -69,7 +69,7 @@ DLLEXPORT ::std::string urltowin(const c
DLLEXPORT char* Int2Str(int value, const char *format, char *buf);
/**
- * colorÀ妽º °ª°ú À½¿µ°ªÀ» Á¶ÇÕÇÏ¿© ½ºÅ¸¿ÀÇǽºÀÇ color·Î º¯È¯
+ * colorì¸ë±ì¤ ê°ê³¼ ììê°ì ì¡°í©íì¬ ì¤íì¤í¼ì¤ì colorë¡ ë³í
*/
DLLEXPORT char *hcolor2str(uchar color, uchar shade, char *buf, bool bIsChar = false);
Modified: openoffice/branches/l10n/main/hwpfilter/source/hfont.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hfont.cpp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hfont.cpp (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hfont.cpp Fri Mar 15 09:24:52 2013
@@ -27,7 +27,7 @@
#include "hwplib.h"
#include "hwpfile.h"
#include "hfont.h"
-/* ÀÌ ÇÔ¼ö´Â HWP ÆÄÀÏÀ» Çؼ®ÇÏ´Â ºÎºÐÀÌ´Ù. */
+/* ì´ í¨ìë HWP íì¼ì í´ìíë ë¶ë¶ì´ë¤. */
HWPFont::HWPFont(void)
{
Modified: openoffice/branches/l10n/main/hwpfilter/source/hinfo.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hinfo.cpp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hinfo.cpp (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hinfo.cpp Fri Mar 15 09:24:52 2013
@@ -62,42 +62,42 @@ HWPInfo::~HWPInfo(void)
/**
- * ¹®¼Á¤º¸¸¦ ÀоîµéÀÌ´Â ÇÔ¼ö ( 128 bytes )
- * ¹®¼Á¤º¸´Â ÆÄÀÏÀνÄÁ¤º¸( 30 bytes ) ´ÙÀ½¿¡ À§Ä¡ÇÑ Á¤º¸ÀÌ´Ù.
+ * 문ìì 보를 ì½ì´ë¤ì´ë í¨ì ( 128 bytes )
+ * 문ìì ë³´ë íì¼ì¸ìì ë³´( 30 bytes ) ë¤ìì ìì¹í ì ë³´ì´ë¤.
*/
bool HWPInfo::Read(HWPFile & hwpf)
{
- hwpf.Read2b(&cur_col, 1); /* ¹®¼¸¦ ÀúÀåÇÒ ´ç½ÃÀÇ Ä¿¼°¡ À§Ä¡ÇÑ ¹®´Ü¹øÈ£ */
- hwpf.Read2b(&cur_row, 1); /* ¹®´Ü Ä */
+ hwpf.Read2b(&cur_col, 1); /* 문ì를 ì ì¥í ë¹ìì 커ìê° ìì¹í 문ë¨ë²í¸ */
+ hwpf.Read2b(&cur_row, 1); /* ë¬¸ë¨ ì¹¸ */
- hwpf.Read1b(&paper.paper_kind, 1); /* ¿ëÁö Á¾·ù */
- hwpf.Read1b(&paper.paper_direction, 1); /* ¿ëÁö ¹æÇâ */
+ hwpf.Read1b(&paper.paper_kind, 1); /* ì©ì§ ì¢
ë¥ */
+ hwpf.Read1b(&paper.paper_direction, 1); /* ì©ì§ ë°©í¥ */
// paper geometry information
- paper.paper_height = (short) hwpf.Read2b(); /* ¿ëÁö ±æÀÌ */
- paper.paper_width = (short) hwpf.Read2b(); /* ¿ëÁö ³Êºñ */
- paper.top_margin = (short) hwpf.Read2b(); /* À§ÂÊ ¿©¹é */
- paper.bottom_margin = (short) hwpf.Read2b(); /* ¾Æ·¡ÂÊ ¿©¹é */
- paper.left_margin = (short) hwpf.Read2b(); /* ¿ÞÂÊ ¿©¹é */
- paper.right_margin = (short) hwpf.Read2b(); /* ¿À¸¥ÂÊ ¿©¹é */
- paper.header_length = (short) hwpf.Read2b(); /* ¸Ó¸®¸» ±æÀÌ */
- paper.footer_length = (short) hwpf.Read2b(); /* ²¿¸®¸» ±æÀÌ */
- paper.gutter_length = (short) hwpf.Read2b(); /* Á¦º»¿©¹é */
- hwpf.Read2b(&readonly, 1); /* ¿¹¾à */
- hwpf.Read1b(reserved1, 4); /* ¿¹¾à */
- hwpf.Read1b(&chain_info.chain_page_no, 1); /* ÂÊ ¹øÈ£ ¿¬°á 1-¿¬°á, 0-»õ·Î½ÃÀÛ (¿¬°áÀμ⿡¼ »ç¿ë) */
- hwpf.Read1b(&chain_info.chain_footnote_no, 1);/* °¢ÁÖ¹øÈ£ ¿¬°á 1-¿¬°á 0-»õ·Î½ÃÀÛ */
- /* ¿¬°áÀμâÇÒ ÆÄÀÏÀÇ À̸§ */
+ paper.paper_height = (short) hwpf.Read2b(); /* ì©ì§ ê¸¸ì´ */
+ paper.paper_width = (short) hwpf.Read2b(); /* ì©ì§ ëë¹ */
+ paper.top_margin = (short) hwpf.Read2b(); /* ì쪽 ì¬ë°± */
+ paper.bottom_margin = (short) hwpf.Read2b(); /* ìë쪽 ì¬ë°± */
+ paper.left_margin = (short) hwpf.Read2b(); /* ì¼ìª½ ì¬ë°± */
+ paper.right_margin = (short) hwpf.Read2b(); /* ì¤ë¥¸ìª½ ì¬ë°± */
+ paper.header_length = (short) hwpf.Read2b(); /* ë¨¸ë¦¬ë§ ê¸¸ì´ */
+ paper.footer_length = (short) hwpf.Read2b(); /* ê¼¬ë¦¬ë§ ê¸¸ì´ */
+ paper.gutter_length = (short) hwpf.Read2b(); /* ì 본ì¬ë°± */
+ hwpf.Read2b(&readonly, 1); /* ìì½ */
+ hwpf.Read1b(reserved1, 4); /* ìì½ */
+ hwpf.Read1b(&chain_info.chain_page_no, 1); /* 쪽 ë²í¸ ì°ê²° 1-ì°ê²°, 0-ìë¡ìì (ì°ê²°ì¸ììì ì¬ì©) */
+ hwpf.Read1b(&chain_info.chain_footnote_no, 1);/* ê°ì£¼ë²í¸ ì°ê²° 1-ì°ê²° 0-ìë¡ìì */
+ /* ì°ê²°ì¸ìí íì¼ì ì´ë¦ */
hwpf.Read1b(chain_info.chain_filename, CHAIN_MAX_PATH);
- hwpf.Read1b(annotation, ANNOTATION_LEN); /* µ¡ºÙÀÌ´Â ¸» ( ÆÄÀÏ ÀúÀåÇÒ ¶§ µ¡ºÙÀÌ´Â ¸»¿¡ ÁöÁ¤ÇÑ ³»¿ë ) */
- hwpf.Read2b(&encrypted, 1); /* ¾ÏÈ£ ¿©ºÎ 0-º¸ÅëÆÄÀÏ, ±×¿Ü-¾ÏÈ£°É¸° ÆÄÀÏ */
-//hwpf.Read1b(reserved2, 6); /* ¾Æ·¡ 3°³ÀÇ°ªÀ¸·Î ¹Ù²î¾ú´Ù. */
- hwpf.Read2b(&beginpagenum,1); /* ÆäÀÌÁö½ÃÀÛ¹øÈ£ */
+ hwpf.Read1b(annotation, ANNOTATION_LEN); /* ë§ë¶ì´ë ë§ ( íì¼ ì ì¥í ë ë§ë¶ì´ë ë§ì ì§ì í ë´ì© ) */
+ hwpf.Read2b(&encrypted, 1); /* ìí¸ ì¬ë¶ 0-ë³´íµíì¼, ê·¸ì¸-ìí¸ê±¸ë¦° íì¼ */
+//hwpf.Read1b(reserved2, 6); /* ìë 3ê°ìê°ì¼ë¡ ë°ëìë¤. */
+ hwpf.Read2b(&beginpagenum,1); /* íì´ì§ììë²í¸ */
// footnote
- hwpf.Read2b(&beginfnnum,1); /* °¢ÁÖ ½ÃÀÛ¹øÈ£ */
- hwpf.Read2b(&countfn,1); /* °¢ÁÖ °¹¼ö */
+ hwpf.Read2b(&beginfnnum,1); /* ê°ì£¼ ììë²í¸ */
+ hwpf.Read2b(&countfn,1); /* ê°ì£¼ ê°¯ì */
splinetext = (short) hwpf.Read2b();
splinefn = (short) hwpf.Read2b();
spfnfn = (short) hwpf.Read2b();
@@ -118,7 +118,7 @@ bool HWPInfo::Read(HWPFile & hwpf)
if (hwpf.State())
return false;
-/* ¹®¼ ¿ä¾àÀ» Àд´Ù. */
+/* 문ì ìì½ì ì½ëë¤. */
if (!summary.Read(hwpf))
return false;
if (info_block_len > 0)
@@ -130,7 +130,7 @@ bool HWPInfo::Read(HWPFile & hwpf)
return false;
}
-/* hwpfÀÇ °ªÀ» Àç¼³Á¤ ÇÑ´Ù. */
+/* hwpfì ê°ì ì¬ì¤ì íë¤. */
hwpf.compressed = compressed ? true : false;
hwpf.encrypted = encrypted ? true : false;
hwpf.info_block_len = info_block_len;
Modified: openoffice/branches/l10n/main/hwpfilter/source/hiodev.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hiodev.cpp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hiodev.cpp (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hiodev.cpp Fri Mar 15 09:24:52 2013
@@ -156,7 +156,7 @@ void HStreamIODev::flush(void)
void HStreamIODev::close(void)
{
-/* Ç÷¯½ÃÇÑ ÈÄ ´Ý´Â´Ù. */
+/* íë¬ìí í ë«ëë¤. */
this->flush();
if (_gzfp)
gz_close(_gzfp); /* gz_close() calls stream_closeInput() */
@@ -172,7 +172,7 @@ int HStreamIODev::state(void) const
}
-/* zlib °ü·Ã ºÎºÐ */
+/* zlib ê´ë ¨ ë¶ë¶ */
bool HStreamIODev::setCompressed(bool flag)
{
compressed = flag;
Modified: openoffice/branches/l10n/main/hwpfilter/source/hiodev.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hiodev.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hiodev.h (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hiodev.h Fri Mar 15 09:24:52 2013
@@ -69,7 +69,7 @@ class DLLEXPORT HIODev
struct gz_stream;
-/* ÆÄÀÏ ÀÔÃâ·Â ÀåÄ¡ */
+/* íì¼ ì
ì¶ë ¥ ì¥ì¹ */
/**
* This controls the HStream given by constructor
@@ -78,7 +78,7 @@ struct gz_stream;
class HStreamIODev : public HIODev
{
private:
-/* zlibÀ¸·Î ¾ÐÃàÀ» Ç®±â À§ÇÑ ÀÚ·á ±¸Á¶ */
+/* zlibì¼ë¡ ìì¶ì í기 ìí ìë£ êµ¬ì¡° */
gz_stream *_gzfp;
HStream& _stream;
public:
@@ -134,7 +134,7 @@ class HStreamIODev : public HIODev
virtual void init();
};
-/* ¸Þ¸ð¸® ÀÔÃâ·Â ÀåÄ¡ */
+/* ë©ëª¨ë¦¬ ì
ì¶ë ¥ ì¥ì¹ */
/**
* The HMemIODev class controls the Input/Output device.
* @short Memory IO device
Modified: openoffice/branches/l10n/main/hwpfilter/source/hpara.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hpara.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hpara.h (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hpara.h Fri Mar 15 09:24:52 2013
@@ -59,7 +59,7 @@ class HWPPara;
struct LineInfo
{
-/* ½ÃÀÛÇÏ´Â ±ÛÀÚÀÇ À§Ä¡ : ÄÜÆ®·ÑÀº ¿©·¯ ±æÀ̸¦ °¡Áø´Ù */
+/* ììíë ê¸ìì ìì¹ : ì½í¸ë¡¤ì ì¬ë¬ 길ì´ë¥¼ ê°ì§ë¤ */
/**
* Starting character position
*/
@@ -90,7 +90,7 @@ class DLLEXPORT HWPPara
/**
* Zero is for the new paragraph style.
*/
- unsigned char reuse_shape; /* 0ÀÌ¸é »õ¸ð¾ç */
+ unsigned char reuse_shape; /* 0ì´ë©´ ì모ì */
unsigned short nch;
unsigned short nline;
@@ -101,15 +101,15 @@ class DLLEXPORT HWPPara
/**
* If the value is 0, all character of paragraph have same style given cshape
*/
- unsigned char contain_cshape; /* 0ÀÌ¸é ¸ðµç ±ÛÀÚ°¡ ´ëÇ¥ ±ÛÀÚ ¸ð¾ç */
+ unsigned char contain_cshape; /* 0ì´ë©´ 모ë ê¸ìê° ëí ê¸ì 모ì */
unsigned char etcflag;
/**
* Checks the special characters in the paragraph
*/
unsigned long ctrlflag;
unsigned char pstyno;
- CharShape cshape; /* ±ÛÀÚ°¡ ¸ðµÎ °°Àº ¸ð¾çÀ϶§ */
- ParaShape pshape; /* reuse flag°¡ 0À̸é */
+ CharShape cshape; /* ê¸ìê° ëª¨ë ê°ì 모ìì¼ë */
+ ParaShape pshape; /* reuse flagê° 0ì´ë©´ */
int pno; /* run-time only */
LineInfo *linfo;
@@ -128,7 +128,7 @@ class DLLEXPORT HWPPara
void SetNext(HWPPara *n) { _next = n; };
-/* layoutÀ» À§ÇÑ ÇÔ¼ö */
+/* layoutì ìí í¨ì */
/**
* Returns the character sytle of paragraph.
*/
Modified: openoffice/branches/l10n/main/hwpfilter/source/hwpeq.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hwpeq.cpp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hwpeq.cpp (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hwpeq.cpp Fri Mar 15 09:24:52 2013
@@ -40,7 +40,7 @@ using namespace std;
//#define DEBUG
-/* @Man: hwp¼ö½ÄÀ» LaTeXÀ¸·Î ¹Ù²Ù±â */
+/* @Man: hwpììì LaTeXì¼ë¡ ë°ê¾¸ê¸° */
#ifdef WIN32
# define ENDL "\r\n"
#else /* !WIN32 */
@@ -133,7 +133,7 @@ static hwpeq eq_tbl[] = {
{ "bullet", NULL, 0, 0 },
{ "cap", NULL, 0, 0 },
{ "cases", NULL, 0, EQ_ENV },
- { "ccol", NULL, 0, 0 }, /* ¼¼·Î·Î °¡¿îµ¥ */
+ { "ccol", NULL, 0, 0 }, /* ì¸ë¡ë¡ ê°ì´ë° */
{ "cdot", NULL, 0, 0 },
{ "cdots", NULL, 0, 0 },
{ "check", NULL, 1, 0 },
@@ -409,7 +409,7 @@ static hwpeq *lookup_eqn(char *str)
return result;
}
-/* ùÀÚ¸¸ ´ë¹®ÀÚÀ̰ųª ÀüºÎ ´ë¹®ÀÚ¸é ¼Ò¹®ÀÚ·Î ¹Ù²Û´Ù. */
+/* 첫ìë§ ë문ìì´ê±°ë ì ë¶ ë문ìë©´ ì문ìë¡ ë°ê¾¼ë¤. */
static char *make_keyword( char *keyword, const char *token)
{
@@ -469,7 +469,7 @@ void push_token(MzString &white, MzStrin
stk->strm = strm;
}
-/*
ÀÐÀº ÅäÅ«ÀÇ ±æÀ̸¦ ¹ÝȯÇÑ´Ù. */
+/*
ì½ì í í°ì 길ì´ë¥¼ ë°ííë¤. */
/* control char, control sequence, binary sequence,
alphabet string, sigle character */
static int next_token(MzString &white, MzString &token, istream *strm)
@@ -505,8 +505,8 @@ static int next_token(MzString &white, M
ch = strm->get();
} while( ch != EOF && (ch & 0x80 || isalpha(ch)) ) ;
strm->putback(sal::static_int_cast<char>(ch));
- /* sub, sub, over, atop Ư¼ö ó¸®
- ±× ÀÌÀ¯´Â next_state()¿¡ ¿µÇâÀ» ¹ÌÄ¡±â ¶§¹®ÀÌ´Ù.
+ /* sub, sub, over, atop í¹ì ì²ë¦¬
+ ê·¸ ì´ì ë next_state()ì ìí¥ì 미ì¹ê¸° ë문ì´ë¤.
*/
if( !STRICMP("sub", token) || !STRICMP("from", token) ||
!STRICMP("sup", token) || !STRICMP("to", token) ||
@@ -557,17 +557,17 @@ static int read_white_space(MzString& ou
return result;
}
-/* Àμö°¡ ÇÊ¿äÇÏÁö ¾ÊÀº °æ¿ì °¢ Ç׸ñ°£ÀÇ ±¸ºÐÀº space¿Í brace
+/* ì¸ìê° íìíì§ ìì ê²½ì° ê° í목ê°ì 구ë¶ì spaceì brace
sqrt {ab}c = sqrt{ab} c
- (, }´Â grouping
- ^, _ ´Â ¾ÕµÚ·Î °áÇÕÇÑ´Ù.
+ (, }ë grouping
+ ^, _ ë ìë¤ë¡ ê²°í©íë¤.
- sqrt µî°ú °°ÀÌ Àμö°¡ ÀÖ´Â Çü½Ä Á¤¸®
+ sqrt ë±ê³¼ ê°ì´ ì¸ìê° ìë íì ì 리
sqrt a -> sqrt{a}
sqrt {a} -> sqrt{a}
- 1 ÀÌ»óÀÇ Àμö°¡ ÀÖ´Â °æ¿ì Àμöµé°£ÀÇ ¿ª¹éÀº ¾ø¾Ø´Ù.
+ 1 ì´ìì ì¸ìê° ìë ê²½ì° ì¸ìë¤ê°ì ìë°±ì ìì¤ë¤.
\frac a b -> frac{a}{b}
- overÀÇ Çü½Ä Á¤¸®
+ overì íì ì 리
a over b -> {a}over{b}
*/
@@ -602,7 +602,7 @@ static int eq_word(MzString& outs, istre
state << white << token;
}
else {
- /* Á¤»óÀûÀÎ token */
+ /* ì ìì ì¸ token */
int script_status = SCRIPT_NONE;
while( 1 ) {
state << white << token;
Modified: openoffice/branches/l10n/main/hwpfilter/source/hwpfile.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hwpfile.cpp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hwpfile.cpp (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hwpfile.cpp Fri Mar 15 09:24:52 2013
@@ -61,7 +61,7 @@ HWPFile::HWPFile(void)
/**
- * TODO : Ãß°¡µÈ ½ºÅ¸Àϸ®½ºÆ®¿¡ ´ëÇÑ ¸Þ¸ð¸® ÇØÁ¦
+ * TODO : ì¶ê°ë ì¤íì¼ë¦¬ì¤í¸ì ëí ë©ëª¨ë¦¬ í´ì
*/
HWPFile::~HWPFile(void)
{
@@ -409,7 +409,7 @@ ColumnDef *HWPFile::GetColumnDef(int num
else
return 0;
}
-/* @return À妽º´Â 1ºÎÅÍ ½ÃÀÛÇÑ´Ù. */
+/* @return ì¸ë±ì¤ë 1ë¶í° ììíë¤. */
int HWPFile::GetPageMasterNum(int page)
{
LinkedListIterator<ColumnInfo> it(&columnlist);
Modified: openoffice/branches/l10n/main/hwpfilter/source/hwpfile.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hwpfile.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hwpfile.h (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hwpfile.h Fri Mar 15 09:24:52 2013
@@ -192,7 +192,7 @@ class DLLEXPORT HWPFile
* Reads paragraph list of hwp file from HIODev
*/
bool ParaListRead();
-/* ±×¸² µîÀÇ Ãß°¡ Á¤º¸¸¦ Àд´Ù. */
+/* 그림 ë±ì ì¶ê° ì 보를 ì½ëë¤. */
/**
* Reads additional information like embeded image of hwp file from HIODev
*/
@@ -271,7 +271,7 @@ class DLLEXPORT HWPFile
OlePicture *oledata;
private:
-/* hwp ÆÄÀÏ À̸§ */
+/* hwp íì¼ ì´ë¦ */
char fname[256];
int m_nCurrentPage;
int m_nMaxSettedPage;
@@ -289,7 +289,7 @@ class DLLEXPORT HWPFile
LinkedList<EmPicture> emblist;
LinkedList<HyperText> hyperlist;
int currenthyper;
- LinkedList<ParaShape> pslist; /* ½ºÅ¸¿ÀÇǽºÀÇ ±¸Á¶»ó ÇÊ¿ä */
+ LinkedList<ParaShape> pslist; /* ì¤íì¤í¼ì¤ì 구조ì íì */
LinkedList<CharShape> cslist;
LinkedList<FBoxStyle> fbslist;
LinkedList<DateCode> datecodes;
Modified: openoffice/branches/l10n/main/hwpfilter/source/hwplib.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/hwpfilter/source/hwplib.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/hwpfilter/source/hwplib.h (original)
+++ openoffice/branches/l10n/main/hwpfilter/source/hwplib.h Fri Mar 15 09:24:52 2013
@@ -29,7 +29,7 @@
#include <string>
-/* hwp96ºÎÅÍ hunit°¡ 4byte°¡ µÇ¾ú´Ù. */
+/* hwp96ë¶í° hunitê° 4byteê° ëìë¤. */
/**
* size of hunit is 4 since hwp96 version
*/
@@ -130,11 +130,11 @@ typedef struct
#define ONE_MILI (71)
#define ONE_DOT (19)
-/* HWP 3.0 ¹®¼ Á¤º¸ */
+/* HWP 3.0 문ì ì ë³´ */
#define NLanguage 7
-/* Á¦¾î ¹®ÀÚ */
+/* ì ì´ ë¬¸ì */
/**
* Control character
*/