← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to plugins/chartshape/kchart_global.h

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/chartshape/kchart_global.h
106
106
    FooterLabelType
107
107
};
108
108
 
 
109
enum OdfMarkerStyle { MarkerSquare         = 0,
 
110
                      MarkerDiamond        = 1,
 
111
                      MarkerArrowDown      = 2,
 
112
                      MarkerArrowUp        = 3,
 
113
                      MarkerArrowRight     = 4,
 
114
                      MarkerArrowLeft      = 5,
 
115
                      MarkerBowTie         = 6,
 
116
                      MarkerHourGlass      = 7,
 
117
                      MarkerCircle         = 8,
 
118
                      MarkerStar           = 9,
 
119
                      MarkerX              = 10,
 
120
                      MarkerCross          = 11,
 
121
                      MarkerAsterisk       = 12,
 
122
                      MarkerHorizontalBar  = 13,
 
123
                      MarkerVerticalBar    = 14,
 
124
                      MarkerRing           = 15,
 
125
                      MarkerFastCross      = 16,
 
126
                      Marker1Pixel         = 17,
 
127
                      Marker4Pixels        = 18,
 
128
                      NoMarker             = 19 };
 
129
 
109
130
} // Namespace KChart
110
131
 
111
132
#endif