Author: chengjh
Date: Mon Dec 3 15:09:34 2012
New Revision: 1416554
URL: http://svn.apache.org/viewvc?rev=1416554&view=rev
Log:
Made some changes to remove the compile warnings on the comparison between
un-uniform data types
Modified:
openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx
openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx?rev=1416554&r1=1416553&r2=1416554&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx Mon Dec 3 15:09:34
2012
@@ -199,13 +199,13 @@ void SwBasicEscherEx::WriteHyperlinkWith
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
- const sal_uInt16 WW8_ID_HLINK = 0x01B8;
+ //const sal_uInt16 WW8_ID_HLINK = 0x01B8;
const sal_uInt32 WW8_HLINK_BODY = 0x00000001; ///
Contains file link or URL.
const sal_uInt32 WW8_HLINK_ABS = 0x00000002; ///
Absolute path.
- const sal_uInt32 WW8_HLINK_DESCR = 0x00000014; ///
Description.
+ //const sal_uInt32 WW8_HLINK_DESCR = 0x00000014; ///
Description.
const sal_uInt32 WW8_HLINK_MARK = 0x00000008; /// Text
mark.
const sal_uInt32 WW8_HLINK_FRAME = 0x00000080; /// Target
frame.
- const sal_uInt32 WW8_HLINK_UNC = 0x00000100; /// UNC
path.
+ //const sal_uInt32 WW8_HLINK_UNC = 0x00000100; /// UNC
path.
SvMemoryStream tmpStrm;
String tmpTextMark;
@@ -263,7 +263,7 @@ void SwBasicEscherEx::WriteHyperlinkWith
{
String aTextMark( rUrl.Copy( 1 ) );
aTextMark.SearchAndReplace( '.', '!' );
- sal_uInt8 tmpLen = aTextMark.Len();
+ //sal_uInt8 tmpLen = aTextMark.Len();
tmpTextMark = aTextMark;
}
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx?rev=1416554&r1=1416553&r2=1416554&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx Mon Dec 3 15:09:34
2012
@@ -314,7 +314,7 @@ void WW8_WrtBookmarks::MoveFieldMarks(sa
{
if (aItr->second)
{
- if (aItr->second->first == nFrom)
+ if (aItr->second->first == (long)nFrom)
{
aItr->second->second.first = true;
aItr->second->first = nTo;
@@ -1433,8 +1433,8 @@ int WW8Export::CollectGrfsOfBullets() co
if ( pDoc )
{
- int nCountRule = pDoc->GetNumRuleTbl().Count();
- for (int n = 0; n < nCountRule; ++n)
+ sal_uInt16 nCountRule = pDoc->GetNumRuleTbl().Count();
+ for (sal_uInt16 n = 0; n < nCountRule; ++n)
{
const SwNumRule &rRule =
*(pDoc->GetNumRuleTbl().GetObject(n));
sal_uInt16 nLevels = rRule.IsContinusNum() ? 1 : 9;
@@ -1449,7 +1449,7 @@ int WW8Export::CollectGrfsOfBullets() co
if ( pGrf )
{
bool bHas = false;
- for (int i = 0; i <
m_vecBulletPic.size(); ++i)
+ for (sal_uInt16 i = 0; i <
m_vecBulletPic.size(); ++i)
{
if
(m_vecBulletPic[i]->GetChecksum() == pGrf->GetChecksum())
{
@@ -1532,7 +1532,7 @@ int WW8Export::GetGrfIndex(const SvxBrus
int nIndex = -1;
if ( rBrush.GetGraphic() )
{
- for (int i = 0; i < m_vecBulletPic.size(); ++i)
+ for (sal_uInt16 i = 0; i < m_vecBulletPic.size(); ++i)
{
if (m_vecBulletPic[i]->GetChecksum() ==
rBrush.GetGraphic()->GetChecksum())
{
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx?rev=1416554&r1=1416553&r2=1416554&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx Mon Dec 3 15:09:34
2012
@@ -2746,12 +2746,17 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLaye
&& pData->GetId() ==
SW_UD_IMAPDATA)
{
SwMacroInfo* macInf =
dynamic_cast<SwMacroInfo*>(pData);
- if( macInf && macInf->GetShapeId() ==
pF->nSpId)
+
+ if( macInf )// && macInf->GetShapeId()
== pF->nSpId)
{
- lnName = macInf->GetHlink();
- aObjName = macInf->GetName();
- aTarFrm = macInf->GetTarFrm();
- break;
+ sal_Int32 nShapeId =
macInf->GetShapeId();
+ if ( nShapeId == pF->nSpId )
+ {
+ lnName =
macInf->GetHlink();
+ aObjName =
macInf->GetName();
+ aTarFrm =
macInf->GetTarFrm();
+ break;
+ }
}
}
}
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx?rev=1416554&r1=1416553&r2=1416554&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx Mon Dec 3 15:09:34
2012
@@ -4712,11 +4712,11 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8G
}
}
// update graphic bullet information
- int nCount =
pLstManager->GetWW8LSTInfoNum();
- for (int i = 0; i < nCount; ++i)
+ sal_uInt16 nCount =
pLstManager->GetWW8LSTInfoNum();
+ for (sal_uInt16 i = 0; i < nCount; ++i)
{
SwNumRule* pRule =
pLstManager->GetNumRule(i);
- for (int j = 0; j < MAXLEVEL;
++j)
+ for (sal_uInt16 j = 0; j <
MAXLEVEL; ++j)
{
SwNumFmt
aNumFmt(pRule->Get(j));
sal_Int16 nType =
aNumFmt.GetNumberingType();
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx?rev=1416554&r1=1416553&r2=1416554&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx Mon Dec 3 15:09:34
2012
@@ -191,8 +191,8 @@ public:
std::vector<sal_uInt8> &rParaSprms, SwTxtNode *pNode=0);
SwNumRule* CreateNextRule(bool bSimple);
~WW8ListManager();
- SwNumRule* GetNumRule(int i);
- int GetWW8LSTInfoNum() const{return maLSTInfos.size();}
+ SwNumRule* GetNumRule(sal_uInt16 i);
+ sal_uInt16 GetWW8LSTInfoNum() const{return maLSTInfos.size();}
private:
wwSprmParser maSprmParser;
SwWW8ImplReader& rReader;
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx?rev=1416554&r1=1416553&r2=1416554&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx Mon Dec 3 15:09:34
2012
@@ -1120,7 +1120,7 @@ SwNumRule* WW8ListManager::CreateNextRul
return pMyNumRule;
}
-SwNumRule* WW8ListManager::GetNumRule(int i)
+SwNumRule* WW8ListManager::GetNumRule(sal_uInt16 i)
{
if ( i >= 0 && i < maLSTInfos.size() )
return maLSTInfos[i]->pNumRule;
